Housekeeping clean up project remove net 7.0 (#389)

This commit is contained in:
Chris Pulman 2024-09-21 13:41:49 +01:00 коммит произвёл GitHub
Родитель a54843d01a
Коммит 215dd3ef09
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
6 изменённых файлов: 4 добавлений и 32 удалений

3
.github/workflows/ci-build.yml поставляемый
Просмотреть файл

@ -15,7 +15,4 @@ jobs:
with: with:
configuration: Release configuration: Release
productNamespacePrefix: "Fusilade" productNamespacePrefix: "Fusilade"
useVisualStudioPreview: false
dotNetBuild: true
useMauiCheckDotNetTool: false
installWorkflows: false installWorkflows: false

4
.github/workflows/release.yml поставляемый
Просмотреть файл

@ -10,9 +10,7 @@ jobs:
with: with:
configuration: Release configuration: Release
productNamespacePrefix: "Fusillade" productNamespacePrefix: "Fusillade"
useVisualStudioPreview: false installWorkflows: false
dotNetBuild: true
useMauiCheckDotNetTool: false
secrets: secrets:
SIGN_CLIENT_USER_ID: ${{ secrets.SIGN_CLIENT_USER_ID }} SIGN_CLIENT_USER_ID: ${{ secrets.SIGN_CLIENT_USER_ID }}
SIGN_CLIENT_SECRET: ${{ secrets.SIGN_CLIENT_SECRET }} SIGN_CLIENT_SECRET: ${{ secrets.SIGN_CLIENT_SECRET }}

Просмотреть файл

@ -20,7 +20,6 @@
<!-- Optional: Include PDB in the built .nupkg --> <!-- Optional: Include PDB in the built .nupkg -->
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder> <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<!-- disable sourcelink on mono, to workaround https://github.com/dotnet/sourcelink/issues/155 --> <!-- disable sourcelink on mono, to workaround https://github.com/dotnet/sourcelink/issues/155 -->
<PackageIconUrl>https://raw.githubusercontent.com/reactiveui/styleguide/master/logo_fusillade/main.png?raw=true</PackageIconUrl>
<EnableNETAnalyzers>True</EnableNETAnalyzers> <EnableNETAnalyzers>True</EnableNETAnalyzers>
<AnalysisLevel>latest</AnalysisLevel> <AnalysisLevel>latest</AnalysisLevel>
<LangVersion>preview</LangVersion> <LangVersion>preview</LangVersion>
@ -31,7 +30,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(IsTestProject)' == 'true'"> <ItemGroup Condition="'$(IsTestProject)' == 'true'">
<PackageReference Include="ReactiveUI.Testing" Version="19.*" /> <PackageReference Include="ReactiveUI.Testing" Version="20.*" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="xunit" Version="2.9.0" /> <PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.console" Version="2.9.0" /> <PackageReference Include="xunit.runner.console" Version="2.9.0" />

Просмотреть файл

@ -2,26 +2,4 @@
<PropertyGroup> <PropertyGroup>
<Product>$(AssemblyName) ($(TargetFramework))</Product> <Product>$(AssemblyName) ($(TargetFramework))</Product>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
<DefineConstants>$(DefineConstants);NET_45;XAML</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS'))">
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac'))">
<DefineConstants>$(DefineConstants);MONO;COCOA</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.TVOS'))">
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.WatchOS'))">
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('tizen'))">
<DefineConstants>$(DefineConstants);TIZEN</DefineConstants>
</PropertyGroup>
</Project> </Project>

Просмотреть файл

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks> <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net472</TargetFrameworks> <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net472</TargetFrameworks>
<NoWarn>$(NoWarn);1591;CA1707;SA1633</NoWarn> <NoWarn>$(NoWarn);1591;CA1707;SA1633</NoWarn>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>

Просмотреть файл

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks> <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
<PackageId>fusillade</PackageId> <PackageId>fusillade</PackageId>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<WarningsAsErrors>CS8625;CS8604;CS8600;CS8614;CS8603;CS8618;CS8619</WarningsAsErrors> <WarningsAsErrors>CS8625;CS8604;CS8600;CS8614;CS8603;CS8618;CS8619</WarningsAsErrors>