Revert "Update to use .NET 6 GA build (#16296)" (#16308)

This reverts commit 6302f4815a.
2021-10-26 15:57:59 -07:00 · 2021-10-26 15:57:59 -07:00 · 14ea042cec
parent d391168ece
commit 14ea042cec
16 changed files with 38 additions and 94 deletions
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@ -1,13 +1,13 @@
 {
  "sdk": {
-    "channel": "6.0.1xx",
+    "channel": "6.0.1xx-rc1",
    "quality": "signed",
    "qualityFallback": "daily",
-    "packageVersionPattern": "6.0.0",
+    "packageVersionPattern": "6.0.0-rc.1",
    "sdkImageVersion": "6.0.100",
-    "nextChannel": "6.0.1xx"
+    "nextChannel": "6.0.1xx-rc1"
  },
  "internalfeed" : {
-    "url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rtm.21515.2-shipping/nuget/v2"
+    "url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rc.1.21458.32-shipping/nuget/v2"
  }
 }
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@ -1990,9 +1990,6 @@
        <Component Id="cmp690BAC3241424F59B5D30DE0E846D03E">
          <File Id="filDBDCB9BFFF9F425B8CF7F7A5F05D42B1" KeyPath="yes" Source="$(var.ProductSourcePath)\cs\System.Private.ServiceModel.resources.dll" />
        </Component>
-        <Component Id="cmp9E908BEE2A0C4E388D536F08499298DE">
-          <File Id="filCEE4EEB730AD48A88769DF2F000700A2" KeyPath="yes" Source="$(var.ProductSourcePath)\cs\System.Web.Services.Description.resources.dll" />
-        </Component>
      </Directory>
      <Directory Id="dirEA0127D6607E68B508B9DB9CE315A2CE" Name="de">
        <Component Id="cmpF2941A91B17EEA22CD6DAB34693D9AC0">
@ -2055,9 +2052,6 @@
        <Component Id="cmpB43ED7BA30C844E2B5C38F7B747EEFDC">
          <File Id="filE106C77258F047E8A384E1E75B7EF6B8" KeyPath="yes" Source="$(var.ProductSourcePath)\de\System.Private.ServiceModel.resources.dll" />
        </Component>
-        <Component Id="cmp3EFF8D009863427AADCCEAB9E87DBE5B">
-          <File Id="filA6E4E23BB4384EC9BBB8D955A538EFD1" KeyPath="yes" Source="$(var.ProductSourcePath)\de\System.Web.Services.Description.resources.dll" />
-        </Component>
      </Directory>
      <Directory Id="dir5B65D7353FBDCD17AB60A674B3FDF93B" Name="es">
        <Component Id="cmpBEB5F3CF75675537751F0D0B32125BF1">
@ -2120,9 +2114,6 @@
        <Component Id="cmpCC4A42AA70EE4418926986F5A4B8D3FA">
          <File Id="fil186134FCB6984F1484A8308DF4F2B917" KeyPath="yes" Source="$(var.ProductSourcePath)\es\System.Private.ServiceModel.resources.dll" />
        </Component>
-        <Component Id="cmp0543A1DA92A9474084354B1BAD40631E">
-          <File Id="fil3D84429ED25241F0B63D59C847512034" KeyPath="yes" Source="$(var.ProductSourcePath)\es\System.Web.Services.Description.resources.dll" />
-        </Component>
      </Directory>
      <Directory Id="dir23063512FA8C884E1B4F08FDF0A44516" Name="fr">
        <Component Id="cmp1DEB513A065956086898BCDACC5887B6">
@ -2185,9 +2176,6 @@
        <Component Id="cmpE7BE9D8F63E04798870E57BA1EABB9A5">
          <File Id="fil93C038D9EED945F5A984CF3C98EDB72B" KeyPath="yes" Source="$(var.ProductSourcePath)\fr\System.Private.ServiceModel.resources.dll" />
        </Component>
-        <Component Id="cmp9B5EDBAD7A8946358A874885C55C70B0">
-          <File Id="filD4E71F0512E942C9B531A9D923AE929D" KeyPath="yes" Source="$(var.ProductSourcePath)\fr\System.Web.Services.Description.resources.dll" />
-        </Component>
      </Directory>
      <Directory Id="dir42B03840AE19D1498CC524F2B6C0389D" Name="it">
        <Component Id="cmp3EC91B8BF4282E77113321E5D1ED27B2">
@ -2250,9 +2238,6 @@
        <Component Id="cmp166B17F72C954B0087DF991E560B399A">
          <File Id="fil528F0FBF10C246568FCE1F5B10E541D1" KeyPath="yes" Source="$(var.ProductSourcePath)\it\System.Private.ServiceModel.resources.dll" />
        </Component>
-        <Component Id="cmp04CCC1B8A47141999E07F6FF22CA41B4">
-          <File Id="filE58F819689E04EA69B54B41B09057F33" KeyPath="yes" Source="$(var.ProductSourcePath)\it\System.Web.Services.Description.resources.dll" />
-        </Component>
      </Directory>
      <Directory Id="dir086D21BE309BE4C7081FC60E3524890F" Name="ja">
        <Component Id="cmp867E4E51FE7BC09AAD5D59FD76716FBC">
@ -2315,9 +2300,6 @@
        <Component Id="cmp529A2B5343FD466884FAF627E37C648D">
          <File Id="fil265B2A6A67EF4C6E8C17BDC3AAD8F729" KeyPath="yes" Source="$(var.ProductSourcePath)\ja\System.Private.ServiceModel.resources.dll" />
        </Component>
-        <Component Id="cmpB5C7A619973A4EFEA3D2B08832BD31F9">
-          <File Id="filC54551CD4A81499BAC1F4BB23C5E6DE5" KeyPath="yes" Source="$(var.ProductSourcePath)\ja\System.Web.Services.Description.resources.dll" />
-        </Component>
      </Directory>
      <Directory Id="dir43D6CAD5F3ED1060009918D06D84FB18" Name="ko">
        <Component Id="cmpAA026CCA623F0E8FB5BAE9F201C5B89D">
@ -2380,9 +2362,6 @@
        <Component Id="cmp4EE1633EE4864CE5B9015BF76BD31D14">
          <File Id="fil688FE14A80204086A48DE1BDC6591EB0" KeyPath="yes" Source="$(var.ProductSourcePath)\ko\System.Private.ServiceModel.resources.dll" />
        </Component>
-        <Component Id="cmp145A39BC36CC45F982F5FE556EF8AD73">
-          <File Id="filBB1C0E2D53A14AFAA0B90B0D169405C9" KeyPath="yes" Source="$(var.ProductSourcePath)\ko\System.Web.Services.Description.resources.dll" />
-        </Component>
      </Directory>
      <Directory Id="dirE8201C74A7184D11233BAD63C6DB37BD" Name="pl">
        <Component Id="cmpA656A18FE14D3C8EB02C31AE474054E3">
@ -2445,9 +2424,6 @@
        <Component Id="cmpC8C68DB0DEE44CF49D98532D2C26395E">
          <File Id="fil1959B05E9F214DCFA6670F1892EE2E7D" KeyPath="yes" Source="$(var.ProductSourcePath)\pl\System.Private.ServiceModel.resources.dll" />
        </Component>
-        <Component Id="cmp611C7B0DC08E4454826C0D1196913CF4">
-          <File Id="fil49AF244A5876422391DFF3CFFBC42031" KeyPath="yes" Source="$(var.ProductSourcePath)\pl\System.Web.Services.Description.resources.dll" />
-        </Component>
      </Directory>
      <Directory Id="dir47ED939BFA870848E0764E862CD6B4D7" Name="pt-BR">
        <Component Id="cmp3D20E940BDBF41630242C63011A80CE5">
@ -2510,9 +2486,6 @@
        <Component Id="cmpF3C18F07C6A148638CBC858EB02E3A6D">
          <File Id="filE6672552F1EE45D3AC3021E02DB093CB" KeyPath="yes" Source="$(var.ProductSourcePath)\pt-BR\System.Private.ServiceModel.resources.dll" />
        </Component>
-        <Component Id="cmpE12B8800744A4C3794F4BC8EE33DE5FE">
-          <File Id="filFFB487AAEB4F463C9F0252FFA97342C6" KeyPath="yes" Source="$(var.ProductSourcePath)\pt-BR\System.Web.Services.Description.resources.dll" />
-        </Component>
      </Directory>
      <Directory Id="dir37B8DFAE26D5F8E9948851F7D19F9E20" Name="ru">
        <Component Id="cmpFDCD51BD80926ABECCE27D0D66A47C8F">
@ -2575,9 +2548,6 @@
        <Component Id="cmpBD958F4B8F9146499DE2CA6321C65F96">
          <File Id="fil6A1EB9311FE546F69F28948794DC43BF" KeyPath="yes" Source="$(var.ProductSourcePath)\ru\System.Private.ServiceModel.resources.dll" />
        </Component>
-        <Component Id="cmp472CE35D99014E168ABDDA26D337D359">
-          <File Id="fil0317B9254BF24E74A4E5E7EDCDC0478E" KeyPath="yes" Source="$(var.ProductSourcePath)\ru\System.Web.Services.Description.resources.dll" />
-        </Component>
      </Directory>
      <Directory Id="dirA7E9CC01273A7FED89FC8D3A368E00CC" Name="tr">
        <Component Id="cmp286FCD0B19BF06446A7274672A2491CA">
@ -2640,9 +2610,6 @@
        <Component Id="cmp2B8239B905B146A69CD5D55A353AC131">
          <File Id="fil618AA430D1794A45A1D2BAA2451BECB2" KeyPath="yes" Source="$(var.ProductSourcePath)\tr\System.Private.ServiceModel.resources.dll" />
        </Component>
-        <Component Id="cmpEC101E06C62142BB8BB9DBD59DAB3D7D">
-          <File Id="fil651FC8DE5CE1421CA791648EFE6DA584" KeyPath="yes" Source="$(var.ProductSourcePath)\tr\System.Web.Services.Description.resources.dll" />
-        </Component>
      </Directory>
      <Directory Id="dir47E993970F74AA9F393D23500827D12C" Name="zh-Hans">
        <Component Id="cmp34C4A21743AC68583599BF2B139F39F2">
@ -2705,9 +2672,6 @@
        <Component Id="cmp582595AE8291444E837793472E0A259C">
          <File Id="fil7044506B31FA4130B2E375147032298D" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hans\System.Private.ServiceModel.resources.dll" />
        </Component>
-        <Component Id="cmp5F5236C855744C60AB9290A74E23D498">
-          <File Id="fil5410F7A1A3D347CFBF90324856B85DD9" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hans\System.Web.Services.Description.resources.dll" />
-        </Component>
      </Directory>
      <Directory Id="dirB1FFB91EED6FD71EA866548CEA3A5298" Name="zh-Hant">
        <Component Id="cmpBC28FE8B65954B00AECA9C534639596D">
@ -2770,9 +2734,6 @@
        <Component Id="cmp91C27D1766E84B8BB0F0C70888F03C2E">
          <File Id="filC888727CE05A4A9FA0DB66EE0F15097C" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hant\System.Private.ServiceModel.resources.dll" />
        </Component>
-        <Component Id="cmp8270465B1B634BFF91B933889318C6D9">
-          <File Id="filC209F02DFEC542FDAB5E8B7CFF450A27" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hant\System.Web.Services.Description.resources.dll" />
-        </Component>
      </Directory>
      <Directory Name="Schemas" Id="dir1DB5B24CC3494785974A51F28F128069">
        <Directory Name="PSMaml" Id="dirAC38B2C7629B42DC836E01F976A10EC9">
@ -3148,11 +3109,8 @@
      <Component Id="cmp09155DA101E1424B98832A789E93E835">
        <File Id="fil7D748565EBF5423A84CFC6D25D21F43C" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.Bcl.AsyncInterfaces.dll" />
      </Component>
-      <Component Id="cmp6AA669F54C1F4675A8EA5E4BA331943F">
-        <File Id="fil2EA0B4C8BC434DA89E4D521F692BCE3C" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Web.Services.Description.dll" />
-      </Component>
-      <Component Id="cmp6AAE145D9E884A0491826ABA6D54FAF6">
-        <File Id="filC52DF6FD7A0749FDAA47D64AD9713D8F" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.51407.dll" />
+      <Component Id="cmpDAFCD776C56B4CF78A4534704588E38B">
+        <File Id="fil0734B55E8FC6480B97679A249A892D54" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.48005.dll" />
      </Component>
    </DirectoryRef>
  </Fragment>
@ -4152,24 +4110,10 @@
      <ComponentRef Id="cmp2B8239B905B146A69CD5D55A353AC131" />
      <ComponentRef Id="cmpBD958F4B8F9146499DE2CA6321C65F96" />
      <ComponentRef Id="cmp166B17F72C954B0087DF991E560B399A" />
+      <ComponentRef Id="cmpDAFCD776C56B4CF78A4534704588E38B" />
      <ComponentRef Id="cmp529A2B5343FD466884FAF627E37C648D" />
      <ComponentRef Id="cmp4EE1633EE4864CE5B9015BF76BD31D14" />
      <ComponentRef Id="cmpE7BE9D8F63E04798870E57BA1EABB9A5" />
-      <ComponentRef Id="cmp04CCC1B8A47141999E07F6FF22CA41B4" />
-      <ComponentRef Id="cmp5F5236C855744C60AB9290A74E23D498" />
-      <ComponentRef Id="cmp6AA669F54C1F4675A8EA5E4BA331943F" />
-      <ComponentRef Id="cmp3EFF8D009863427AADCCEAB9E87DBE5B" />
-      <ComponentRef Id="cmp0543A1DA92A9474084354B1BAD40631E" />
-      <ComponentRef Id="cmp611C7B0DC08E4454826C0D1196913CF4" />
-      <ComponentRef Id="cmpB5C7A619973A4EFEA3D2B08832BD31F9" />
-      <ComponentRef Id="cmpE12B8800744A4C3794F4BC8EE33DE5FE" />
-      <ComponentRef Id="cmp9B5EDBAD7A8946358A874885C55C70B0" />
-      <ComponentRef Id="cmpEC101E06C62142BB8BB9DBD59DAB3D7D" />
-      <ComponentRef Id="cmp9E908BEE2A0C4E388D536F08499298DE" />
-      <ComponentRef Id="cmp472CE35D99014E168ABDDA26D337D359" />
-      <ComponentRef Id="cmp8270465B1B634BFF91B933889318C6D9" />
-      <ComponentRef Id="cmp6AAE145D9E884A0491826ABA6D54FAF6" />
-      <ComponentRef Id="cmp145A39BC36CC45F982F5FE556EF8AD73" />
    </ComponentGroup>
  </Fragment>
 </Wix>
--- a/global.json
+++ b/global.json
@ -1,5 +1,5 @@
 {
  "sdk": {
-    "version": "6.0.100-rtm.21515.2"
+    "version": "6.0.100-rc.2.21505.57"
  }
 }
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
@ -47,7 +47,7 @@

  <ItemGroup>
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rc.2.21480.5" />
  </ItemGroup>

 </Project>
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@ -31,9 +31,9 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-6.final" />
-    <PackageReference Include="System.Threading.AccessControl" Version="6.0.0-rtm.21514.7" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-5.final" />
+    <PackageReference Include="System.Threading.AccessControl" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0-rc.2.21480.5" />
    <PackageReference Include="NJsonSchema" Version="10.5.2" />
  </ItemGroup>

--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
@ -8,7 +8,7 @@

  <ItemGroup>
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-rc.2.21480.5" />
  </ItemGroup>

 </Project>
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@ -18,9 +18,9 @@
    <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="6.0.0-rtm.21514.7" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-rtm.21514.7" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.IO.Packaging" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-rc.2.21480.5" />
    <!-- the following package(s) are from https://github.com/dotnet/wcf -->
    <PackageReference Include="System.ServiceModel.Duplex" Version="4.9.0-rc2.21473.1" />
    <PackageReference Include="System.ServiceModel.Http" Version="4.9.0-rc2.21473.1" />
@ -30,7 +30,7 @@
    <PackageReference Include="System.Private.ServiceModel" Version="4.9.0-rc2.21473.1" />
    <!-- the source could not be found for the following package(s) -->
    <PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.2.21480.5" />
  </ItemGroup>

 </Project>
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
@ -10,7 +10,7 @@
    <ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
    <ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rc.2.21480.5" />
  </ItemGroup>

  <PropertyGroup>
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@ -16,16 +16,16 @@
    <!-- the Application Insights package -->
    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.18.0" />
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-rtm.21514.7" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-rtm.21514.7" />
-    <PackageReference Include="System.DirectoryServices" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.DirectoryServices" Version="6.0.0-rc.2.21480.5" />
    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" />
-    <PackageReference Include="System.Management" Version="6.0.0-rtm.21514.7" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-rtm.21514.7" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rtm.21514.7" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-rtm.21514.7" />
-    <PackageReference Include="System.Security.Permissions" Version="6.0.0-rtm.21514.7" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.Management" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Security.Permissions" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.2.21480.5" />
    <!-- the following package(s) are from the powershell org -->
    <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
    <PackageReference Include="Microsoft.PowerShell.Native" Version="7.2.0" />
--- a/test/perf/dotnet-tools/Reporting/Reporting.csproj
+++ b/test/perf/dotnet-tools/Reporting/Reporting.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <OutputType>Library</OutputType>
@ -7,7 +7,7 @@

  <ItemGroup>
    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="5.0.0-preview.5.20278.1" />
+    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
  </ItemGroup>

 </Project>
--- a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
+++ b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFrameworks>$(PERFLAB_TARGET_FRAMEWORKS)</TargetFrameworks>
@ -6,10 +6,10 @@
    <LangVersion>latest</LangVersion>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.0-preview1" />
+    <PackageReference Include="CommandLineParser" Version="2.4.3" />
    <PackageReference Include="MarkdownLog.NS20" Version="0.10.1" />
    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
    <PackageReference Include="Perfolizer" Version="0.2.1" />
  </ItemGroup>
 </Project>
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@ -13,7 +13,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.2.21480.5" />
  </ItemGroup>

 </Project>
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@ -7,8 +7,8 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rtm.21514.23" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.2.21480.10" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.2.21480.5" />
  </ItemGroup>

  <ItemGroup>
--- a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@ -14,7 +14,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rc.2.21480.5" />
    <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0" />
  </ItemGroup>
 </Project>
--- a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
+++ b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
@ -9,7 +9,7 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rc.2.21480.5" />
    <PackageReference Include="System.Security.Principal.Windows" Version="6.0.0-preview.5.21301.5" />
  </ItemGroup>
 </Project>
--- a/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
+++ b/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
@ -5,7 +5,7 @@ parameters:
 steps:
 - pwsh: |
      Import-Module ${{ parameters.repoRoot }}/build.psm1 -Force
-      New-NugetConfigFile -NugetFeedUrl $(PSInternalNugetFeed) -UserName $(PSInternalNugetFeedUserName) -ClearTextPAT $(PSInternalNugetFeedPAT) -FeedName AzDevOpsFeed -Destination '${{ parameters.repoRoot }}/src/Modules'
+      New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT2) -FeedName AzDevOpsFeed -Destination '${{ parameters.repoRoot }}/src/Modules'

      if(-not (Test-Path "${{ parameters.repoRoot }}/src/Modules/nuget.config"))
      {