Update SDK and VS and migrate to PackageReference

.nuget/packages.config

@@ -4,4 +4,4 @@
   <package id="Microsoft.Web.StyleCop" version="1.0.0" />
   <package id="StyleCop" version="5.0.0" />
   <package id="xunit.runner.msbuild" version="2.4.2" targetFramework="net452" />
-</packages>
+</packages>

Directory.Build.props

@@ -11,6 +11,12 @@
     <SuppressLegacyCodeAnalysisDeprecatedWarning>true</SuppressLegacyCodeAnalysisDeprecatedWarning>
     <!-- Workaround continued use of netcoreapp2.1; suppress the NETSDK1138 warning. -->
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
+    <!-- Workaround continued use of netstandard1.x; suppress the NETSDK1215 warning. -->
+    <CheckNotRecommendedTargetFramework>false</CheckNotRecommendedTargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
+  </ItemGroup>
+
 </Project>

Runtime.msbuild

@@ -56,7 +56,7 @@
     <_Testing_NetStandard1_3 Include="true;false" />
   </ItemGroup>
 
-  <Target Name="RestorePackages" DependsOnTargets="DownloadNuGet">
+  <Target Name="RestorePackages">
     <Message Text="%0ARestoring NuGet packages..." Importance="High" />
 
     <!--
@@ -68,13 +68,15 @@
       BuildInParallel="true"
       Properties="Configuration=$(Configuration);CodeAnalysis=$(CodeAnalysis);StyleCopEnabled=$(StyleCopEnabled);
                   RestorePackagesConfig=true;VisualStudioVersion=$(VisualStudioVersion);
-                  Testing_NetStandard1_3=%(_Testing_NetStandard1_3.Identity)"
+                  Testing_NetStandard1_3=%(_Testing_NetStandard1_3.Identity);
+                  MSBuildRestoreSessionId=$([System.Guid]::NewGuid())"
       RemoveProperties="Platform" />
 
     <MSBuild Projects="Runtime.sln" Targets="Restore"
       BuildInParallel="$(RestoreInParallel)"
       Properties="Configuration=$(Configuration);CodeAnalysis=$(CodeAnalysis);StyleCopEnabled=$(StyleCopEnabled);
-                  RestorePackagesConfig=true;VisualStudioVersion=$(VisualStudioVersion)" />
+                  RestorePackagesConfig=true;VisualStudioVersion=$(VisualStudioVersion);
+                  MSBuildRestoreSessionId=$([System.Guid]::NewGuid())" />
     <Message Importance="High" Text="" />
   </Target>
 

build.cmd

@@ -6,7 +6,7 @@ mkdir bin
 
 :Build
 
-REM Require VS2019 (v16.0) on the system. Use `vswhere` for the search because it can find all VS installations.
+REM Require Visual Studio on the system. Use `vswhere` for the search because it can find all VS installations.
 set vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
 if not exist %vswhere% (
   set vswhere="%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe"
@@ -23,54 +23,19 @@ if not exist %vswhere% (
 )
 
 set InstallDir=
-for /f "usebackq tokens=*" %%i in (`%vswhere% -version 16 -latest -prerelease -products * ^
-    -requires Microsoft.Net.Component.4.5.TargetingPack ^
-    -requires Microsoft.Net.Component.4.5.2.TargetingPack ^
-    -requires Microsoft.Net.Component.4.6.2.TargetingPack ^
+for /f "usebackq tokens=*" %%i in (`%vswhere% -latest -prerelease -products * ^
     -property installationPath`) do (
   set "InstallDir=%%i"
 )
 
 if not DEFINED InstallDir (
-  echo "Could not find a VS2019 installation with the necessary components (targeting packs for v4.5, v4.5.2, and v4.6.2)."
-  echo Please install VS2019 or the missing components.
+  echo "Could not find a Visual Studio installation."
+  echo Please install Visual Studio or the missing components.
   goto BuildFail
 )
 
-REM Find a 64bit MSBuild and add it to path. Require v17.4 or later due to our .NET SDK choice.
-REM Check for VS2022 first.
-set InstallDir=
-for /f "usebackq tokens=*" %%i in (`%vswhere% -version 17.4 -latest -prerelease -products * ^
-    -requires Microsoft.Component.MSBuild ^
-    -property installationPath`) do (
-  set "InstallDir=%%i"
-)
-
-if DEFINED InstallDir (
-  REM Add MSBuild to the path.
-  set "PATH=%InstallDir%\MSBuild\Current\Bin;%PATH%"
-  goto FoundMSBuild
-)
-
-REM Otherwise find or install an xcopy-able MSBuild.
-echo "Could not find a VS2022 installation with the necessary components (MSBuild). Falling back..."
-
-set "MSBuildVersion=17.4.1"
-set "Command=[System.Threading.Thread]::CurrentThread.CurrentCulture = ''"
-set "Command=%Command%; [System.Threading.Thread]::CurrentThread.CurrentUICulture = ''"
-set "Command=%Command%; try { & '%~dp0eng\GetXCopyMSBuild.ps1' %MSBuildVersion%; exit $LASTEXITCODE }"
-set "Command=%Command%  catch { write-host $_; exit 1 }"
-PowerShell -NoProfile -NoLogo -ExecutionPolicy Bypass -Command "%Command%"
-if %ERRORLEVEL% neq 0 goto BuildFail
-
 REM Add MSBuild to the path.
-set "PATH=%~dp0.msbuild\%MSBuildVersion%\tools\MSBuild\Current\Bin;%PATH%"
-
-:FoundMSBuild
-REM Configure NuGet operations to work w/in this repo i.e. do not pollute system packages folder.
-REM Note this causes two copies of packages restored using packages.config to land in this folder e.g.
-REM StyleCpy.5.0.0/ and stylecop/5.0.0/.
-set "NUGET_PACKAGES=%~dp0packages"
+set "PATH=%InstallDir%\MSBuild\Current\Bin;%PATH%"
 
 REM Are we running in a local dev environment (not on CI)?
 if DEFINED CI (set Desktop=false) else if DEFINED TEAMCITY_VERSION (set Desktop=false) else (set Desktop=true)

eng/templates/default-build.yml

@@ -8,7 +8,7 @@ jobs:
   ${{ if eq(variables['System.TeamProject'], 'public') }}:
     pool:
       name: NetCore-Svc-Public
-      demands: ImageOverride -equals windows.vs2019.amd64.open
+      demands: ImageOverride -equals 1es-windows-2022-open
   timeoutInMinutes: 30
 
   strategy:
@@ -46,6 +46,11 @@ jobs:
     inputs:
       packageType: runtime
       version: '2.1.x'
+  - task: UseDotNet@2
+    displayName: Get .NET 6.0 runtime
+    inputs:
+      packageType: runtime
+      version: '6.0.x'
 
   - script: .\build.cmd EnableSkipStrongNames
     displayName: Enable SkipStrongNames

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.405",
+    "version": "8.0.413",
     "rollForward": "major"
   }
 }

src/Microsoft.AspNet.Facebook/Microsoft.AspNet.Facebook.csproj

@@ -22,15 +22,11 @@
     <DefineConstants>TRACE;CODE_ANALYSIS;ASPNETFACEBOOK</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Facebook, Version=6.0.10.0, Culture=neutral, PublicKeyToken=58cb4f2111d1e6de, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Facebook.6.4.2\lib\net45\Facebook.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
+    <PackageReference Include="Facebook" Version="6.4.2" />
+    <PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" PrivateAssets="All" />
+  </ItemGroup>
+  <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.configuration" />
@@ -92,11 +88,7 @@
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
+
   <ItemGroup>
     <EmbeddedResource Include="Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

src/Microsoft.Web.Helpers/Microsoft.Web.Helpers.csproj

@@ -13,6 +13,10 @@
     <DefineConstants>$(DefineConstants);ASPNETWEBPAGES</DefineConstants>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
+  <ItemGroup>
+    <!-- Note: RazorGenerator.MsBuild uses Razor 3.0 \ Mvc 5.0 for generating views. In the event we update the Mvc parser, we'll need to ensure this package references the updated Mvc build -->
+    <PackageReference Include="RazorGenerator.MsBuild" Version="2.2.0" />
+  </ItemGroup>
   <ItemGroup>
     <CodeAnalysisDictionary Include="..\CodeAnalysisDictionary.xml" />
   </ItemGroup>
@@ -95,7 +99,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <RazorSrcFiles Include="Analytics.cshtml" />
     <RazorSrcFiles Include="FileUpload.cshtml" />
     <RazorSrcFiles Include="GamerCard.cshtml" />
@@ -105,7 +108,4 @@
     <RazorSrcFiles Include="Maps.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-
-  <!-- Note: RazorGenerator.MsBuild uses Razor 3.0 \ Mvc 5.0 for generating views. In the event we update the Mvc parser, we'll need to ensure this package references the updated Mvc build -->
-  <Import Project="..\..\packages\RazorGenerator.MsBuild.2.2.0\build\RazorGenerator.MsBuild.targets" Condition="Exists('..\..\packages\RazorGenerator.MsBuild.2.2.0\build\RazorGenerator.MsBuild.targets')" />
 </Project>

src/Microsoft.Web.WebPages.OAuth/Microsoft.Web.WebPages.OAuth.csproj

@@ -16,30 +16,15 @@
     <CodeAnalysisDictionary Include="..\CodeAnalysisDictionary.xml" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="DotNetOpenAuth.AspNet, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\DotNetOpenAuth.AspNet.4.0.3.12153\lib\net40-full\DotNetOpenAuth.AspNet.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\DotNetOpenAuth.Core.4.0.3.12153\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\DotNetOpenAuth.OAuth.Core.4.0.3.12153\lib\net40-full\DotNetOpenAuth.OAuth.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth.Consumer, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\DotNetOpenAuth.OAuth.Consumer.4.0.3.12153\lib\net40-full\DotNetOpenAuth.OAuth.Consumer.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.3.12153\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.RelyingParty, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\DotNetOpenAuth.OpenId.RelyingParty.4.0.3.12153\lib\net40-full\DotNetOpenAuth.OpenId.RelyingParty.dll</HintPath>
-    </Reference>
+    <PackageReference Include="CodeContracts.Unofficial" Version="1.0.0.0" />
+    <PackageReference Include="DotNetOpenAuth.AspNet" Version="4.0.3.12153" />
+    <PackageReference Include="DotNetOpenAuth.Core" Version="4.0.3.12153" />
+    <PackageReference Include="DotNetOpenAuth.OAuth.Consumer" Version="4.0.3.12153" />
+    <PackageReference Include="DotNetOpenAuth.OAuth.Core" Version="4.0.3.12153" />
+    <PackageReference Include="DotNetOpenAuth.OpenId.Core" Version="4.0.3.12153" />
+    <PackageReference Include="DotNetOpenAuth.OpenId.RelyingParty" Version="4.0.3.12153" />
+  </ItemGroup>
+  <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -108,9 +93,7 @@
       <LastGenOutput>OAuthResources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
+
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj

@@ -15,46 +15,25 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" PrivateAssets="All" />
+    <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" PrivateAssets="All" />
+    <PackageReference Include="NETStandard.Library" Version="2.0.3" PrivateAssets="All" />
+    <PackageReference Include="System.Buffers" Version="4.5.1" PrivateAssets="All" />
+    <PackageReference Include="System.Memory" Version="4.5.5" PrivateAssets="All" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" PrivateAssets="All" />
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Buffers.4.5.1\lib\netstandard2.0\System.Buffers.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Memory.4.5.5\lib\netstandard2.0\System.Memory.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
-
-    <Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NETStandard.Library.2.0.3\lib\netstandard2.0\netstandard.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
+  </ItemGroup>
+  <ItemGroup>
 
     <Compile Include="..\CommonAssemblyInfo.cs" Link="Properties\CommonAssemblyInfo.cs" />
     <Compile Include="..\Common\CollectionExtensions.cs" Link="Common\CollectionExtensions.cs" />
@@ -89,8 +68,6 @@
     </EmbeddedResource>
 
     <CodeAnalysisDictionary Include="..\CodeAnalysisDictionary.xml" Link="CodeAnalysisDictionary.xml" />
-
-    <None Include="packages.config" />
   </ItemGroup>
 
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />