Upgrade generic-netf to .NET Framework 4.8.1

This commit is contained in:
JustArchi
2022-09-07 23:25:45 +02:00
parent 582f508f33
commit cc55e386c9
7 changed files with 10 additions and 10 deletions

View File

@@ -9,7 +9,7 @@ env:
DOTNET_NOLOGO: true DOTNET_NOLOGO: true
DOTNET_SDK_VERSION: 6.0.x DOTNET_SDK_VERSION: 6.0.x
NET_CORE_VERSION: net6.0 NET_CORE_VERSION: net6.0
NET_FRAMEWORK_VERSION: net48 NET_FRAMEWORK_VERSION: net481
NODE_JS_VERSION: 'lts/*' NODE_JS_VERSION: 'lts/*'
STEAM_TOKEN_DUMPER_NAME: ArchiSteamFarm.OfficialPlugins.SteamTokenDumper STEAM_TOKEN_DUMPER_NAME: ArchiSteamFarm.OfficialPlugins.SteamTokenDumper
STEAM_TOKEN_DUMPER_TOKEN: ${{ secrets.STEAM_TOKEN_DUMPER_TOKEN }} STEAM_TOKEN_DUMPER_TOKEN: ${{ secrets.STEAM_TOKEN_DUMPER_TOKEN }}

View File

@@ -11,7 +11,7 @@
<PackageReference Include="System.Composition.AttributedModel" IncludeAssets="compile" /> <PackageReference Include="System.Composition.AttributedModel" IncludeAssets="compile" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net48'"> <ItemGroup Condition="'$(TargetFramework)' == 'net481'">
<!-- Madness is already included in netf build of ASF, so we don't need to emit it ourselves --> <!-- Madness is already included in netf build of ASF, so we don't need to emit it ourselves -->
<PackageReference Update="JustArchiNET.Madness" IncludeAssets="compile" /> <PackageReference Update="JustArchiNET.Madness" IncludeAssets="compile" />

View File

@@ -9,7 +9,7 @@
<PackageReference Include="System.Composition.AttributedModel" IncludeAssets="compile" /> <PackageReference Include="System.Composition.AttributedModel" IncludeAssets="compile" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net48'"> <ItemGroup Condition="'$(TargetFramework)' == 'net481'">
<!-- Madness is already included in netf build of ASF, so we don't need to emit it ourselves --> <!-- Madness is already included in netf build of ASF, so we don't need to emit it ourselves -->
<PackageReference Update="JustArchiNET.Madness" IncludeAssets="compile" /> <PackageReference Update="JustArchiNET.Madness" IncludeAssets="compile" />
</ItemGroup> </ItemGroup>

View File

@@ -12,7 +12,7 @@
<PackageReference Include="System.Composition.AttributedModel" IncludeAssets="compile" /> <PackageReference Include="System.Composition.AttributedModel" IncludeAssets="compile" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net48'"> <ItemGroup Condition="'$(TargetFramework)' == 'net481'">
<!-- Madness is already included in netf build of ASF, so we don't need to emit it ourselves --> <!-- Madness is already included in netf build of ASF, so we don't need to emit it ourselves -->
<PackageReference Update="JustArchiNET.Madness" IncludeAssets="compile" /> <PackageReference Update="JustArchiNET.Madness" IncludeAssets="compile" />
</ItemGroup> </ItemGroup>

View File

@@ -25,11 +25,11 @@
<PackageReference Include="zxcvbn-core" /> <PackageReference Include="zxcvbn-core" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'net48'"> <ItemGroup Condition="'$(TargetFramework)' != 'net481'">
<PackageReference Include="System.Security.Cryptography.ProtectedData" /> <PackageReference Include="System.Security.Cryptography.ProtectedData" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net48'"> <ItemGroup Condition="'$(TargetFramework)' == 'net481'">
<PackageReference Include="Microsoft.AspNetCore.Cors" /> <PackageReference Include="Microsoft.AspNetCore.Cors" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" /> <PackageReference Include="Microsoft.AspNetCore.Diagnostics" />
<PackageReference Include="Microsoft.AspNetCore.HttpOverrides" /> <PackageReference Include="Microsoft.AspNetCore.HttpOverrides" />

View File

@@ -31,7 +31,7 @@
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net48'"> <ItemGroup Condition="'$(TargetFramework)' == 'net481'">
<PackageReference Include="JustArchiNET.Madness" /> <PackageReference Include="JustArchiNET.Madness" />
<PackageReference Include="TA.System.Runtime.CompilerServices.RuntimeHelpers.GetSubArray" /> <PackageReference Include="TA.System.Runtime.CompilerServices.RuntimeHelpers.GetSubArray" />
@@ -99,7 +99,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(OS)' == 'Windows_NT' OR '$(ASFNetFramework)' != ''"> <PropertyGroup Condition="'$(OS)' == 'Windows_NT' OR '$(ASFNetFramework)' != ''">
<TargetFrameworks>net6.0;net48</TargetFrameworks> <TargetFrameworks>net6.0;net481</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(OS)' != 'Windows_NT' AND '$(ASFNetFramework)' == ''"> <PropertyGroup Condition="'$(OS)' != 'Windows_NT' AND '$(ASFNetFramework)' == ''">

View File

@@ -22,11 +22,11 @@
<PackageVersion Include="zxcvbn-core" Version="7.0.92" /> <PackageVersion Include="zxcvbn-core" Version="7.0.92" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'net48'"> <ItemGroup Condition="'$(TargetFramework)' != 'net481'">
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="6.0.0" /> <PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="6.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net48'"> <ItemGroup Condition="'$(TargetFramework)' == 'net481'">
<PackageVersion Include="JustArchiNET.Madness" Version="3.7.0" /> <PackageVersion Include="JustArchiNET.Madness" Version="3.7.0" />
<PackageVersion Include="Microsoft.AspNetCore.Cors" Version="2.2.0" /> <PackageVersion Include="Microsoft.AspNetCore.Cors" Version="2.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" /> <PackageVersion Include="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />