Clean up

JamesNK · JamesNK · commit b3c0dabe6d7e · 2022-02-16T10:39:12.000+13:00
diff --git a/src/Grpc/Grpc.slnf b/src/Grpc/Grpc.slnf
@@ -1,11 +1,19 @@
-﻿{
+{
   "solution": {
     "path": "..\\..\\AspNetCore.sln",
-    "projects" : [
+    "projects": [
+      "src\\Grpc\\HttpApi\\perf\\Microsoft.AspNetCore.Grpc.Microbenchmarks\\Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj",
+      "src\\Grpc\\HttpApi\\src\\Microsoft.AspNetCore.Grpc.HttpApi\\Microsoft.AspNetCore.Grpc.HttpApi.csproj",
+      "src\\Grpc\\HttpApi\\src\\Microsoft.AspNetCore.Grpc.Swagger\\Microsoft.AspNetCore.Grpc.Swagger.csproj",
+      "src\\Grpc\\HttpApi\\test\\Microsoft.AspNetCore.Grpc.HttpApi.IntegrationTests\\Microsoft.AspNetCore.Grpc.HttpApi.IntegrationTests.csproj",
+      "src\\Grpc\\HttpApi\\test\\Microsoft.AspNetCore.Grpc.HttpApi.Tests\\Microsoft.AspNetCore.Grpc.HttpApi.Tests.csproj",
+      "src\\Grpc\\HttpApi\\test\\Microsoft.AspNetCore.Grpc.Swagger.Tests\\Microsoft.AspNetCore.Grpc.Swagger.Tests.csproj",
+      "src\\Grpc\\HttpApi\\test\\testassets\\IntegrationTestsWebsite\\IntegrationTestsWebsite.csproj",
+      "src\\Grpc\\HttpApi\\test\\testassets\\Sandbox\\Sandbox.csproj",
       "src\\Grpc\\Interop\\test\\InteropTests\\InteropTests.csproj",
-      "src\\Grpc\\Interop\\test\\testassets\\InteropWebsite\\InteropWebsite.csproj",
       "src\\Grpc\\Interop\\test\\testassets\\InteropClient\\InteropClient.csproj",
+      "src\\Grpc\\Interop\\test\\testassets\\InteropWebsite\\InteropWebsite.csproj",
       "src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj"
     ]
   }
-}
+}
diff --git a/src/Grpc/HttpApi/perf/Microsoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj b/src/Grpc/HttpApi/perf/Microsoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Grpc/HttpApi/src/Microsoft.AspNetCore.Grpc.HttpApi/Microsoft.AspNetCore.Grpc.HttpApi.csproj b/src/Grpc/HttpApi/src/Microsoft.AspNetCore.Grpc.HttpApi/Microsoft.AspNetCore.Grpc.HttpApi.csproj
@@ -6,7 +6,7 @@
     <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
 
     <!-- Disable analysis for ConfigureAwait(false) -->
     <WarningsNotAsErrors>$(WarningsNotAsErrors);CA2007</WarningsNotAsErrors>
diff --git a/src/Grpc/HttpApi/src/Microsoft.AspNetCore.Grpc.Swagger/Microsoft.AspNetCore.Grpc.Swagger.csproj b/src/Grpc/HttpApi/src/Microsoft.AspNetCore.Grpc.Swagger/Microsoft.AspNetCore.Grpc.Swagger.csproj
@@ -6,7 +6,7 @@
     <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
 
     <!-- Disable analysis for ConfigureAwait(false) -->
     <WarningsNotAsErrors>$(WarningsNotAsErrors);CA2007</WarningsNotAsErrors>
diff --git a/src/Grpc/HttpApi/test/Microsoft.AspNetCore.Grpc.HttpApi.IntegrationTests/Microsoft.AspNetCore.Grpc.HttpApi.IntegrationTests.csproj b/src/Grpc/HttpApi/test/Microsoft.AspNetCore.Grpc.HttpApi.IntegrationTests/Microsoft.AspNetCore.Grpc.HttpApi.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/src/Grpc/HttpApi/test/Microsoft.AspNetCore.Grpc.HttpApi.Tests/Microsoft.AspNetCore.Grpc.HttpApi.Tests.csproj b/src/Grpc/HttpApi/test/Microsoft.AspNetCore.Grpc.HttpApi.Tests/Microsoft.AspNetCore.Grpc.HttpApi.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/src/Grpc/HttpApi/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/Microsoft.AspNetCore.Grpc.Swagger.Tests.csproj b/src/Grpc/HttpApi/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/Microsoft.AspNetCore.Grpc.Swagger.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <IsPackable>false</IsPackable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>1591</NoWarn>
diff --git a/src/Grpc/HttpApi/test/testassets/IntegrationTestsWebsite/IntegrationTestsWebsite.csproj b/src/Grpc/HttpApi/test/testassets/IntegrationTestsWebsite/IntegrationTestsWebsite.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     
diff --git a/src/Grpc/HttpApi/test/testassets/Sandbox/Sandbox.csproj b/src/Grpc/HttpApi/test/testassets/Sandbox/Sandbox.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <IsPackable>false</IsPackable>
     <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
   </PropertyGroup>
diff --git a/src/Grpc/Interop/test/testassets/InteropWebsite/Properties/launchSettings.json b/src/Grpc/Interop/test/testassets/InteropWebsite/Properties/launchSettings.json
@@ -3,8 +3,8 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:54288/",
-      "sslPort": 44374
+      "applicationUrl": "http://localhost:54462/",
+      "sslPort": 44363
     }
   },
   "profiles": {
@@ -24,4 +24,4 @@
       }
     }
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`"windowsAuthentication": false,`
`4`	`4`	`"anonymousAuthentication": true,`
`5`	`5`	`"iisExpress": {`
`6`		`- "applicationUrl": "http://localhost:54288/",`
`7`		`- "sslPort": 44374`
	`6`	`+ "applicationUrl": "http://localhost:54462/",`
	`7`	`+ "sslPort": 44363`
`8`	`8`	`}`
`9`	`9`	`},`
`10`	`10`	`"profiles": {`
`@@ -24,4 +24,4 @@`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`}`
`27`		`-}`
	`27`	`+}`