Merge pull request #5 from lars-lange/dotnet7

upgrade to dotnet7
kshyju · Dec 7, 2023 · d335ed3 · d335ed3
2 parents e843157 + 50f1991
commit d335ed3
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 193 deletions.
diff --git a/BrowserDetector.sln b/BrowserDetector.sln
@@ -17,9 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BrowserDetector.Benchmarks"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DemoApp.NET5", "sample\DemoApp.NET5\DemoApp.NET5.csproj", "{FC9EDDF8-1A96-4814-87E4-4EEAF2BCFD39}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DemoApp.NET3.1", "sample\DemoApp.NET3.1\DemoApp.NET3.1.csproj", "{35866D18-F8C6-4D23-B229-7E8D9A527507}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BrowserDetector.NetCore", "src\BrowserDetector.NetCore\BrowserDetector.NetCore.csproj", "{2E0D3C7A-98AA-475A-816B-3B51EA377C6A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BrowserDetector.Net", "src\BrowserDetector.NetCore\BrowserDetector.Net.csproj", "{2E0D3C7A-98AA-475A-816B-3B51EA377C6A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,10 +37,6 @@ Global
 		{FC9EDDF8-1A96-4814-87E4-4EEAF2BCFD39}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FC9EDDF8-1A96-4814-87E4-4EEAF2BCFD39}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FC9EDDF8-1A96-4814-87E4-4EEAF2BCFD39}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35866D18-F8C6-4D23-B229-7E8D9A527507}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35866D18-F8C6-4D23-B229-7E8D9A527507}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35866D18-F8C6-4D23-B229-7E8D9A527507}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35866D18-F8C6-4D23-B229-7E8D9A527507}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2E0D3C7A-98AA-475A-816B-3B51EA377C6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2E0D3C7A-98AA-475A-816B-3B51EA377C6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2E0D3C7A-98AA-475A-816B-3B51EA377C6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,7 +49,6 @@ Global
 		{AC18FC9B-5E79-4FDA-9B35-9F2E716C2BD9} = {12F52172-93E2-490D-B544-6BC9BFCBDE4F}
 		{74E28CEE-CBE2-49DB-811A-B63E8FDD744E} = {5AB86EFC-4E36-4570-BB16-C09AC8C71BAC}
 		{FC9EDDF8-1A96-4814-87E4-4EEAF2BCFD39} = {9E1E33C8-9F0A-42A5-909F-54079AB3AEF3}
-		{35866D18-F8C6-4D23-B229-7E8D9A527507} = {9E1E33C8-9F0A-42A5-909F-54079AB3AEF3}
 		{2E0D3C7A-98AA-475A-816B-3B51EA377C6A} = {B909FEDF-3397-4308-B8E3-E538D84AC14D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

diff --git a/perf/BrowserDetector.Benchmarks/BrowserDetector.Benchmarks.csproj b/perf/BrowserDetector.Benchmarks/BrowserDetector.Benchmarks.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>browserdetectorperf.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\BrowserDetector.NetCore\BrowserDetector.NetCore.csproj" />
+    <ProjectReference Include="..\..\src\BrowserDetector.NetCore\BrowserDetector.Net.csproj" />
   </ItemGroup>
 
 </Project>

diff --git a/sample/DemoApp.NET3.1/Controllers/HomeController.cs b/sample/DemoApp.NET3.1/Controllers/HomeController.cs
diff --git a/sample/DemoApp.NET3.1/DemoApp.NET3.1.csproj b/sample/DemoApp.NET3.1/DemoApp.NET3.1.csproj
diff --git a/sample/DemoApp.NET3.1/Program.cs b/sample/DemoApp.NET3.1/Program.cs
diff --git a/sample/DemoApp.NET3.1/Properties/launchSettings.json b/sample/DemoApp.NET3.1/Properties/launchSettings.json
diff --git a/sample/DemoApp.NET3.1/Startup.cs b/sample/DemoApp.NET3.1/Startup.cs
diff --git a/sample/DemoApp.NET3.1/appsettings.Development.json b/sample/DemoApp.NET3.1/appsettings.Development.json
diff --git a/sample/DemoApp.NET3.1/appsettings.json b/sample/DemoApp.NET3.1/appsettings.json
diff --git a/sample/DemoApp.NET5/DemoApp.NET5.csproj b/sample/DemoApp.NET5/DemoApp.NET5.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\BrowserDetector.NetCore\BrowserDetector.NetCore.csproj" />
+    <ProjectReference Include="..\..\src\BrowserDetector.NetCore\BrowserDetector.Net.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/BrowserDetector.NetCore/BrowserDetector.Net.csproj b/src/BrowserDetector.NetCore/BrowserDetector.Net.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net7.0</TargetFramework>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<FrameworkReference Include="Microsoft.AspNetCore.App" />
+	</ItemGroup>
+
+</Project>
diff --git a/src/BrowserDetector.NetCore/BrowserDetector.NetCore.csproj b/src/BrowserDetector.NetCore/BrowserDetector.NetCore.csproj
diff --git a/tests/BrowserDetector.Tests/BrowserDetector.Tests.csproj b/tests/BrowserDetector.Tests/BrowserDetector.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\BrowserDetector.NetCore\BrowserDetector.NetCore.csproj" />
+    <ProjectReference Include="..\..\src\BrowserDetector.NetCore\BrowserDetector.Net.csproj" />
   </ItemGroup>
 
 </Project>