From 0c3d6dee73f324ba8e27339c388670507e992099 Mon Sep 17 00:00:00 2001
From: Joel Francis <32407840+vexx32@users.noreply.github.com>
Date: Thu, 4 Feb 2021 09:14:54 -0500
Subject: [PATCH] Update to .NET Framework 4.8

---
 NuGet.Settings.targets                        | 11 +++----
 .../NuGet.Server.V2.Samples.OwinHost.csproj   |  6 ++--
 .../app.config                                | 32 +++++++++----------
 .../NuGet.Server.Core.csproj                  |  2 +-
 src/NuGet.Server.V2/NuGet.Server.V2.csproj    |  6 ++--
 src/NuGet.Server/NuGet.Server.csproj          |  2 +-
 .../NuGet.Server.Core.Tests.csproj            |  2 +-
 .../NuGet.Server.Tests.csproj                 |  2 +-
 .../NuGet.Server.V2.Tests.csproj              |  2 +-
 9 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/NuGet.Settings.targets b/NuGet.Settings.targets
index 92d33eb..cb8b5b8 100644
--- a/NuGet.Settings.targets
+++ b/NuGet.Settings.targets
@@ -4,7 +4,7 @@
         <MonoBuild>true</MonoBuild>
         <DefineConstants>$(DefineConstants);MONO;</DefineConstants>
 	<VisualStudioVersion>11.0</VisualStudioVersion>
-    </PropertyGroup>    
+    </PropertyGroup>
 
     <!-- Common Build Settings and Configurations -->
     <PropertyGroup>
@@ -18,18 +18,17 @@
         <AppDesignerFolder>Properties</AppDesignerFolder>
         <TargetFrameworkProfile />
         <FileAlignment>512</FileAlignment>
-        <TargetFrameworkProfile />
         <ErrorReport>prompt</ErrorReport>
         <WarningLevel>4</WarningLevel>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
         <AdditionalSettingsImport Condition=" $(AdditionalSettingsImport) == '' ">$(NuGetRoot)\Extended.Settings.targets</AdditionalSettingsImport>
     </PropertyGroup>
-    
+
     <PropertyGroup Condition=" $(VisualStudioVersion) == '10.0' ">
         <ShellAssembly>Microsoft.VisualStudio.Shell.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</ShellAssembly>
         <ShellAssemblyHintPath>..\..\lib\VS10\Microsoft.VisualStudio.Shell.10.0.dll</ShellAssemblyHintPath>
-    
+
         <MSBuildAssembly>Microsoft.Build</MSBuildAssembly>
         <VCProjectEngineAssembly>Microsoft.VisualStudio.VCProjectEngine, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</VCProjectEngineAssembly>
         <VCProjectEngineAssemblyHintPath>..\..\lib\Microsoft.VisualStudio.VCProjectEngine.dll</VCProjectEngineAssemblyHintPath>
@@ -41,7 +40,7 @@
         <VCProjectEngineAssembly>Microsoft.VisualStudio.VCProjectEngine, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</VCProjectEngineAssembly>
     </PropertyGroup>
 
-    <PropertyGroup Condition=" $(VisualStudioVersion) == '12.0' ">        
+    <PropertyGroup Condition=" $(VisualStudioVersion) == '12.0' ">
         <ShellAssembly>Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</ShellAssembly>
         <ShellAssemblyHintPath>..\..\lib\VS12\Microsoft.VisualStudio.Shell.12.0.dll</ShellAssemblyHintPath>
 
@@ -108,7 +107,7 @@
     <PropertyGroup Condition=" '$(Configuration)' == 'Coverage' ">
         <OutputPath>bin\Coverage\</OutputPath>
         <Coverage>true</Coverage>
-        <DefineConstants>$(DefineConstants);CODE_COVERAGE</DefineConstants> 
+        <DefineConstants>$(DefineConstants);CODE_COVERAGE</DefineConstants>
     </PropertyGroup>
 
     <Import Project="$(AdditionalSettingsImport)" Condition="Exists('$(AdditionalSettingsImport)')" />
diff --git a/samples/NuGet.Server.V2.Samples.OwinHost/NuGet.Server.V2.Samples.OwinHost.csproj b/samples/NuGet.Server.V2.Samples.OwinHost/NuGet.Server.V2.Samples.OwinHost.csproj
index a9e24d1..47cf0e7 100644
--- a/samples/NuGet.Server.V2.Samples.OwinHost/NuGet.Server.V2.Samples.OwinHost.csproj
+++ b/samples/NuGet.Server.V2.Samples.OwinHost/NuGet.Server.V2.Samples.OwinHost.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props" Condition="Exists('..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NuGet.Server.V2.Samples.OwinHost</RootNamespace>
     <AssemblyName>NuGet.Server.V2.Samples.OwinHost</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
@@ -151,4 +151,4 @@
     <Error Condition="!Exists('..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets'))" />
   </Target>
   <Import Project="..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets" Condition="Exists('..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets')" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/samples/NuGet.Server.V2.Samples.OwinHost/app.config b/samples/NuGet.Server.V2.Samples.OwinHost/app.config
index 10d3a53..f7c05d7 100644
--- a/samples/NuGet.Server.V2.Samples.OwinHost/app.config
+++ b/samples/NuGet.Server.V2.Samples.OwinHost/app.config
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
+        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
+        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
+        <assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/src/NuGet.Server.Core/NuGet.Server.Core.csproj b/src/NuGet.Server.Core/NuGet.Server.Core.csproj
index 49c72fc..6b51387 100644
--- a/src/NuGet.Server.Core/NuGet.Server.Core.csproj
+++ b/src/NuGet.Server.Core/NuGet.Server.Core.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NuGet.Server.Core</RootNamespace>
     <AssemblyName>NuGet.Server.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
diff --git a/src/NuGet.Server.V2/NuGet.Server.V2.csproj b/src/NuGet.Server.V2/NuGet.Server.V2.csproj
index 9d3f7c8..a051830 100644
--- a/src/NuGet.Server.V2/NuGet.Server.V2.csproj
+++ b/src/NuGet.Server.V2/NuGet.Server.V2.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NuGet.Server.V2</RootNamespace>
     <AssemblyName>NuGet.Server.V2</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
@@ -42,8 +42,8 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Data.OData, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll<      <SpecificVersion>False</SpecificVersion>
-HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Web.XmlTransform">
diff --git a/src/NuGet.Server/NuGet.Server.csproj b/src/NuGet.Server/NuGet.Server.csproj
index cbe751b..c59cf1c 100644
--- a/src/NuGet.Server/NuGet.Server.csproj
+++ b/src/NuGet.Server/NuGet.Server.csproj
@@ -16,7 +16,7 @@
     <UseGlobalApplicationHostFile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <Use64BitIISExpress />
   </PropertyGroup>
diff --git a/test/NuGet.Server.Core.Tests/NuGet.Server.Core.Tests.csproj b/test/NuGet.Server.Core.Tests/NuGet.Server.Core.Tests.csproj
index 63c89df..1975ad6 100644
--- a/test/NuGet.Server.Core.Tests/NuGet.Server.Core.Tests.csproj
+++ b/test/NuGet.Server.Core.Tests/NuGet.Server.Core.Tests.csproj
@@ -9,7 +9,7 @@
     <RootNamespace>NuGet.Server.Core.Tests</RootNamespace>
     <AssemblyName>NuGet.Server.Core.Tests</AssemblyName>
     <ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
diff --git a/test/NuGet.Server.Tests/NuGet.Server.Tests.csproj b/test/NuGet.Server.Tests/NuGet.Server.Tests.csproj
index 02e0b7e..6bdd537 100644
--- a/test/NuGet.Server.Tests/NuGet.Server.Tests.csproj
+++ b/test/NuGet.Server.Tests/NuGet.Server.Tests.csproj
@@ -9,7 +9,7 @@
     <RootNamespace>NuGet.Server.Tests</RootNamespace>
     <AssemblyName>NuGet.Server.Tests</AssemblyName>
     <ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
diff --git a/test/NuGet.Server.V2.Tests/NuGet.Server.V2.Tests.csproj b/test/NuGet.Server.V2.Tests/NuGet.Server.V2.Tests.csproj
index d2e1660..2c91d89 100644
--- a/test/NuGet.Server.V2.Tests/NuGet.Server.V2.Tests.csproj
+++ b/test/NuGet.Server.V2.Tests/NuGet.Server.V2.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NuGet.Server.V2.Tests</RootNamespace>
     <AssemblyName>NuGet.Server.V2.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>