8000 Updated .NET Framework target to 4.6.2 by atifaziz · Pull Request #934 · morelinq/MoreLINQ · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Updated .NET Framework target to 4.6.2 #934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 19, 2023
Merged

Updated .NET Framework target to 4.6.2 #934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions MoreLinq.Test/CurrentThreadCultureScope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,7 @@ protected override void Restore(CultureInfo old)

static void Install(CultureInfo value)
{
#if NET451
System.Threading.Thread.CurrentThread.CurrentCulture = value;
#else
CultureInfo.CurrentCulture = value;
#endif
}
}
}
8 changes: 4 additions & 4 deletions MoreLinq.Test/MoreLinq.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<AssemblyTitle>MoreLinq.Test</AssemblyTitle>
<TargetFrameworks>net7.0;net6.0;netcoreapp3.1;net451</TargetFrameworks>
<TargetFrameworks>net7.0;net6.0;netcoreapp3.1;net462</TargetFrameworks>
<DebugType>portable</DebugType>
<AssemblyName>MoreLinq.Test</AssemblyName>
<OutputType>Exe</OutputType>
Expand Down Expand Up @@ -48,11 +48,11 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net451'">
<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
<PackageReference Include="System.Linq.Async" Version="5.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net451'">
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Compile Remove="Async\*.cs" />
</ItemGroup>

Expand All @@ -64,7 +64,7 @@
<Compile Include="..\MoreLinq\Reactive\Subject.cs" Link="Subject.cs" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net451'">
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Reference Include="System" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
Expand Down
2 changes: 1 addition & 1 deletion MoreLinq/Experimental/Await.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ static class TupleComparer<T1, T2, T3>

static class CompletedTask
{
#if NET451 || NETSTANDARD1_0
#if NETSTANDARD1_0

public static readonly Task Instance = CreateCompletedTask();

Expand Down
8 changes: 4 additions & 4 deletions MoreLinq/MoreLinq.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
<NeutralLanguage>en-US</NeutralLanguage>
<VersionPrefix>3.3.2</VersionPrefix>
<Authors>MoreLINQ Developers.</Authors>
<TargetFrameworks>net451;netstandard1.0;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<TargetFrameworks>net462;netstandard1.0;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<!-- Parallel build is disabled to avoid file locking issues during T4 code generation.
See also: https://github.com/dotnet/msbuild/issues/2781 -->
<BuildInParallel>false</BuildInParallel>
Expand Down Expand Up @@ -180,7 +180,7 @@
</None>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net451'">
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
Expand All @@ -191,7 +191,7 @@
<DefineConstants>$(DefineConstants);MORELINQ</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net451' ">
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net462' ">
<DefineConstants>$(DefineConstants);NO_BUFFERS</DefineConstants>
</PropertyGroup>

Expand All @@ -204,7 +204,7 @@
<Compile Remove="Extensions.ToDataTable.g.cs" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0' Or '$(TargetFramework)' == 'net451'">
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0' Or '$(TargetFramework)' == 'net462'">
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions test.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ call build ^
&& call :test net6.0 Release ^
&& call :test netcoreapp3.1 Debug ^
&& call :test netcoreapp3.1 Release ^
&& call :test net451 Debug ^
&& call :test net451 Release ^
&& call :test net462 Debug ^
&& call :test net462 Release ^
&& call :report-cover
goto :EOF

Expand All @@ -30,8 +30,8 @@ goto :EOF
setlocal
cd MoreLinq.Test
echo Testing %1 (%2)...
if %1==net451 (
bin\%2\net451\MoreLinq.Test.exe
if %1==net462 (
bin\%2\net462\MoreLinq.Test.exe
exit /b %ERRORLEVEL%
)
dotnet test --no-build -f %1 -c %2 --settings coverlet.runsettings || exit /b 1
Expand Down
2 changes: 1 addition & 1 deletion test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ if [[ -z `which mono 2>/dev/null` ]]; then
echo>&2 against the Mono runtime will be skipped.
else
for c in $configs; do
mono MoreLinq.Test/bin/$c/net451/MoreLinq.Test.exe
mono MoreLinq.Test/bin/$c/net462/MoreLinq.Test.exe
done
fi
0