Skip to content
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

Migrate TargetFramework netstandard2.0 -> net6.0 #601

Merged
merged 4 commits into from
Sep 12, 2023
Merged

Migrate TargetFramework netstandard2.0 -> net6.0 #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6fbb07c
Migrate TargetFramework netstandard2.0 -> net6.0 (except for DevExtre…
mpreyskurantov Sep 12, 2023
94bce39
Remove Tests.EFCore1 and Tests.EFCore2 from sln
mpreyskurantov Sep 12, 2023
efb9a08
Remove old dotnet-version
mpreyskurantov Sep 12, 2023
e1ca8b2
Convert Tests.Common to multi target, get rid netstandard2.0
mpreyskurantov Sep 12, 2023
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
1 change: 0 additions & 1 deletion .github/actions/dotnet-test-build/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ runs:
with:
dotnet-quality: ga
dotnet-version: |
3.1
6.0
7.0

Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,7 @@ jobs:
- uses: actions/setup-dotnet@v3
with:
dotnet-quality: ga
dotnet-version: |
3.1
6.0
dotnet-version: 6.0

- uses: actions/checkout@v3

Expand Down
2 changes: 1 addition & 1 deletion net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>net452;net6.0</TargetFrameworks>
<RootNamespace>DevExtreme.AspNet.Data.Tests</RootNamespace>
<IsTestProject>False</IsTestProject>
</PropertyGroup>
Expand Down
26 changes: 0 additions & 26 deletions net/DevExtreme.AspNet.Data.Tests.EFCore1/DevExtreme.AspNet.Data.Tests.EFCore1.csproj
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions net/DevExtreme.AspNet.Data.Tests.EFCore2/DevExtreme.AspNet.Data.Tests.EFCore2.csproj
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion net/DevExtreme.AspNet.Data.Tests.EFCore3/DevExtreme.AspNet.Data.Tests.EFCore3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<DefineConstants>EFCORE3</DefineConstants>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion net/DevExtreme.AspNet.Data.Tests.EFCore5/DevExtreme.AspNet.Data.Tests.EFCore5.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<DefineConstants>EFCORE5</DefineConstants>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion net/DevExtreme.AspNet.Data.Tests.EFCore6/DevExtreme.AspNet.Data.Tests.EFCore6.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<DefineConstants>EFCORE6</DefineConstants>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion net/DevExtreme.AspNet.Data.Tests.EFCore7/DevExtreme.AspNet.Data.Tests.EFCore7.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<DefineConstants>EFCORE7</DefineConstants>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion net/DevExtreme.AspNet.Data.Tests.Xpo/DevExtreme.AspNet.Data.Tests.Xpo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion net/DevExtreme.AspNet.Data.Tests/DevExtreme.AspNet.Data.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
24 changes: 6 additions & 18 deletions net/DevExtreme.AspNet.Data.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Test
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample", "Sample\Sample.csproj", "{760B3927-BB40-4D5B-B64C-880E75E4A4A5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevExtreme.AspNet.Data.Tests.NET4", "DevExtreme.AspNet.Data.Tests.NET4\DevExtreme.AspNet.Data.Tests.NET4.csproj", "{D083C7D4-E8EC-409F-8B45-512FABB21A54}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.NET4", "DevExtreme.AspNet.Data.Tests.NET4\DevExtreme.AspNet.Data.Tests.NET4.csproj", "{D083C7D4-E8EC-409F-8B45-512FABB21A54}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevExtreme.AspNet.Data.Tests.EF6", "DevExtreme.AspNet.Data.Tests.EF6\DevExtreme.AspNet.Data.Tests.EF6.csproj", "{C401BB6E-D21B-45D5-AB98-6B308DB4E4FB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.EF6", "DevExtreme.AspNet.Data.Tests.EF6\DevExtreme.AspNet.Data.Tests.EF6.csproj", "{C401BB6E-D21B-45D5-AB98-6B308DB4E4FB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.EFCore1", "DevExtreme.AspNet.Data.Tests.EFCore1\DevExtreme.AspNet.Data.Tests.EFCore1.csproj", "{215EE7D0-0E2B-4A07-810F-9224F0C5021F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.Common", "DevExtreme.AspNet.Data.Tests.Common\DevExtreme.AspNet.Data.Tests.Common.csproj", "{F5878AD6-459F-4FCE-9BFB-54EE94D2083F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevExtreme.AspNet.Data.Tests.Common", "DevExtreme.AspNet.Data.Tests.Common\DevExtreme.AspNet.Data.Tests.Common.csproj", "{F5878AD6-459F-4FCE-9BFB-54EE94D2083F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.Xpo", "DevExtreme.AspNet.Data.Tests.Xpo\DevExtreme.AspNet.Data.Tests.Xpo.csproj", "{074B5988-B409-4BEE-BF12-79762B459857}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.EFCore2", "DevExtreme.AspNet.Data.Tests.EFCore2\DevExtreme.AspNet.Data.Tests.EFCore2.csproj", "{03F66C05-DB87-483C-B96D-567EC4C6BF5C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.NH", "DevExtreme.AspNet.Data.Tests.NH\DevExtreme.AspNet.Data.Tests.NH.csproj", "{B9B11471-3317-4A42-B3AE-1879B76E3941}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevExtreme.AspNet.Data.Tests.Xpo", "DevExtreme.AspNet.Data.Tests.Xpo\DevExtreme.AspNet.Data.Tests.Xpo.csproj", "{074B5988-B409-4BEE-BF12-79762B459857}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevExtreme.AspNet.Data.Tests.NH", "DevExtreme.AspNet.Data.Tests.NH\DevExtreme.AspNet.Data.Tests.NH.csproj", "{B9B11471-3317-4A42-B3AE-1879B76E3941}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevExtreme.AspNet.Data.Tests.L2S", "DevExtreme.AspNet.Data.Tests.L2S\DevExtreme.AspNet.Data.Tests.L2S.csproj", "{190E01CD-78FC-4578-ACBF-7D6C4DC57C18}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.L2S", "DevExtreme.AspNet.Data.Tests.L2S\DevExtreme.AspNet.Data.Tests.L2S.csproj", "{190E01CD-78FC-4578-ACBF-7D6C4DC57C18}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.EFCore3", "DevExtreme.AspNet.Data.Tests.EFCore3\DevExtreme.AspNet.Data.Tests.EFCore3.csproj", "{3DAF3316-6B1B-4961-831A-790647662554}"
EndProject
Expand Down Expand Up @@ -66,18 +62,10 @@ Global
{C401BB6E-D21B-45D5-AB98-6B308DB4E4FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C401BB6E-D21B-45D5-AB98-6B308DB4E4FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C401BB6E-D21B-45D5-AB98-6B308DB4E4FB}.Release|Any CPU.Build.0 = Release|Any CPU
{215EE7D0-0E2B-4A07-810F-9224F0C5021F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{215EE7D0-0E2B-4A07-810F-9224F0C5021F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{215EE7D0-0E2B-4A07-810F-9224F0C5021F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{215EE7D0-0E2B-4A07-810F-9224F0C5021F}.Release|Any CPU.Build.0 = Release|Any CPU
{F5878AD6-459F-4FCE-9BFB-54EE94D2083F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F5878AD6-459F-4FCE-9BFB-54EE94D2083F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F5878AD6-459F-4FCE-9BFB-54EE94D2083F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F5878AD6-459F-4FCE-9BFB-54EE94D2083F}.Release|Any CPU.Build.0 = Release|Any CPU
{03F66C05-DB87-483C-B96D-567EC4C6BF5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{03F66C05-DB87-483C-B96D-567EC4C6BF5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{03F66C05-DB87-483C-B96D-567EC4C6BF5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{03F66C05-DB87-483C-B96D-567EC4C6BF5C}.Release|Any CPU.Build.0 = Release|Any CPU
{074B5988-B409-4BEE-BF12-79762B459857}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{074B5988-B409-4BEE-BF12-79762B459857}.Debug|Any CPU.Build.0 = Debug|Any CPU
{074B5988-B409-4BEE-BF12-79762B459857}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
4 changes: 2 additions & 2 deletions net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PropertyGroup>
<AssemblyName>DevExtreme.AspNet.Data</AssemblyName>
<AssemblyVersion>99.0</AssemblyVersion>
<TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net452;net6.0</TargetFrameworks>
<DebugType>full</DebugType>
<DocumentationFile>bin\Debug\$(TargetFramework)\DevExtreme.AspNet.Data.xml</DocumentationFile>
<NoWarn>1591</NoWarn>
Expand All @@ -28,7 +28,7 @@
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
<PackageReference Include="Microsoft.CSharp" Version="4.4.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion net/Sample/Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading