Revert "Update .NET SDK version from 5.0.100-preview.5.20279.10 to 5.0.100-preview.6.20319.2 (#12992)" (#13017)

This reverts commit ce8dc1e30c.
2020-06-23 11:52:20 -07:00 · 2020-06-23 11:52:20 -07:00 · 0d75cfdc2d
parent 7500513911
commit 0d75cfdc2d
12 changed files with 44 additions and 28 deletions
--- a/assets/files.wxs
+++ b/assets/files.wxs
@ -48,6 +48,12 @@
      <Component Id="cmp2CACC20993A24B6183A07B0723E20662">
        <File Id="fil2CACC20993A24B6183A07B0723E20662" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Runtime.Intrinsics.dll" />
      </Component>
+      <Component Id="cmpD442235C7FAB4FC08279217AAD418D8F">
+        <File Id="filD442235C7FAB4FC08279217AAD418D8F" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Runtime.WindowsRuntime.UI.Xaml.dll" />
+      </Component>
+      <Component Id="cmpEC09C60D0B3F49E78568FCF93718A249">
+        <File Id="filEC09C60D0B3F49E78568FCF93718A249" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Runtime.WindowsRuntime.dll" />
+      </Component>
      <Component Id="cmp4477FC97930D452DA018C8F6A3D7D168">
        <File Id="fil4477FC97930D452DA018C8F6A3D7D168" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Security.Cryptography.ProtectedData.dll" />
      </Component>
@ -606,6 +612,9 @@
      <Component Id="cmpC57663058794D67CD71E9334A7DBFB11">
        <File Id="fil498537DD5C38285E4B3A1C50B2B0E23A" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Windows.dll" />
      </Component>
+      <Component Id="cmpCB2FCEE967F59AE69BAC96EF19772EB2">
+        <File Id="fil2B0866B4B64ECAF928C0E895FC70B011" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Runtime.InteropServices.WindowsRuntime.dll" />
+      </Component>
      <Component Id="cmp5084DA048CE4466B2B33CC19E8E160C0">
        <File Id="fil22B3F0CDB4C28A54A92A1BB0E052A83E" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Linq.Queryable.dll" />
      </Component>
@ -1558,6 +1567,9 @@
        <Component Id="cmp5C521E049A6A4AFBB757B0A6EAA719A1">
          <File Id="fil5BE8E3168F104F9F956C7CB8FCF31902" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\Microsoft.VisualBasic.dll" />
        </Component>
+        <Component Id="cmpCC43FBF6DDE54BF993571B297033AD70">
+          <File Id="filCCEB803AB6224EE798C3910BB179E18A" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Runtime.InteropServices.WindowsRuntime.dll" />
+        </Component>
        <Component Id="cmp6E47302FE24348BDBED003ACA133F7DB">
          <File Id="fil1B879010BBE0469B81D9F0D3F2CC443C" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Runtime.Serialization.dll" />
        </Component>
@ -3100,8 +3112,8 @@
      <Component Id="cmp7BDE558CCB344A399134DE2C9E2C8D3D">
        <File Id="filF907AD3E73324DEA94AE90E9625AFA73" KeyPath="yes" Source="$(env.ProductSourcePath)\api-ms-win-core-console-l1-2-0.dll" />
      </Component>
-      <Component Id="cmpECA9F52E6C7B46DFBF72DA3E46BAA935" Guid="{d5d678ab-f67a-4fd1-aa15-577c02e5638e}">
-        <File Id="filBC8AE665C1454024AAEF7E677AD10239" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.30506.dll" />
+      <Component Id="cmp616C61FD507945649F648DC488C9ADCB" Guid="{3ede300d-c2b2-4bdc-8e05-57bbc06140c6}">
+        <File Id="filB67C6FC5EF904288BB4DFCB5010033D7" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.27801.dll" />
      </Component>
    </DirectoryRef>
  </Fragment>
@ -3122,6 +3134,8 @@
      <ComponentRef Id="cmpC9B33CF1478E4A73A8C48853FEDBF014" />
      <ComponentRef Id="cmp9B8B3C498C954C47B35F15527E72C6D2" />
      <ComponentRef Id="cmp2CACC20993A24B6183A07B0723E20662" />
+      <ComponentRef Id="cmpD442235C7FAB4FC08279217AAD418D8F" />
+      <ComponentRef Id="cmpEC09C60D0B3F49E78568FCF93718A249" />
      <ComponentRef Id="cmp4477FC97930D452DA018C8F6A3D7D168" />
      <ComponentRef Id="cmp30C10EC477714A76B2A8D0A957D1D6F3" />
      <ComponentRef Id="cmp31176C5A3BDB4A9F95171A4780D7D4D2" />
@ -3308,6 +3322,7 @@
      <ComponentRef Id="cmp5DE1EE232F232719DFB8EC9DF88FDE03" />
      <ComponentRef Id="cmp2C835739E602911F79B064D2F0CB241A" />
      <ComponentRef Id="cmpC57663058794D67CD71E9334A7DBFB11" />
+      <ComponentRef Id="cmpCB2FCEE967F59AE69BAC96EF19772EB2" />
      <ComponentRef Id="cmp5084DA048CE4466B2B33CC19E8E160C0" />
      <ComponentRef Id="cmpA1069497315F9B59DAC010E401DDE5F8" />
      <ComponentRef Id="cmp79B0C6718C0A7BFE6B6810F6DAD41E81" />
@ -3625,6 +3640,7 @@
      <ComponentRef Id="cmp8490EDAA5CBE43C4908761C12B7082F3" />
      <ComponentRef Id="cmp282D15F724FF462BA8DD96C984CF7A92" />
      <ComponentRef Id="cmp5C521E049A6A4AFBB757B0A6EAA719A1" />
+      <ComponentRef Id="cmpCC43FBF6DDE54BF993571B297033AD70" />
      <ComponentRef Id="cmp6E47302FE24348BDBED003ACA133F7DB" />
      <ComponentRef Id="cmp63589D2DF7554D2188C43D463450582D" />
      <ComponentRef Id="cmp7C95FAD00FBA4F0398673010B419DA0F" />
--- a/global.json
+++ b/global.json
@ -1,5 +1,5 @@
 {
  "sdk": {
-    "version": "5.0.100-preview.6.20319.2"
+    "version": "5.0.100-preview.5.20279.10"
  }
 }
--- 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="5.0.0-preview.6.20305.6" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.5.20278.1" />
  </ItemGroup>

 </Project>
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@ -32,8 +32,8 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.6.0" />
-    <PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.6.20305.6" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.6.20305.6" />
+    <PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.5.20278.1" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.5.20278.1" />
    <PackageReference Include="NJsonSchema" Version="10.1.21" />
  </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="5.0.0-preview.6.20305.6" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0-preview.5.20278.1" />
  </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.1" />
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="5.0.0-preview.6.20305.6" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.6.20305.6" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-preview.6.20305.6" />
+    <PackageReference Include="System.IO.Packaging" Version="5.0.0-preview.5.20278.1" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.5.20278.1" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-preview.5.20278.1" />
    <!-- the following package(s) are from https://github.com/dotnet/wcf -->
    <PackageReference Include="System.ServiceModel.Duplex" Version="4.7.0" />
    <PackageReference Include="System.ServiceModel.Http" Version="4.7.0" />
@ -30,7 +30,7 @@
    <PackageReference Include="System.Private.ServiceModel" Version="4.7.0" />
    <!-- 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="5.0.0-preview.6.20305.6" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.5.20278.1" />
  </ItemGroup>

 </Project>
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
@ -9,7 +9,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="5.0.0-preview.6.20305.6" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.5.20278.1" />
  </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.14.0" />
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-preview.6.20305.6" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.6.20305.6" />
-    <PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.6.20305.6" />
-    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.6.20305.6" />
-    <PackageReference Include="System.Management" Version="5.0.0-preview.6.20305.6" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.6.20305.6" />
-    <PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.6.20305.6" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.6.20305.6" />
-    <PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.6.20305.6" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.6.20305.6" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-preview.5.20278.1" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.5.20278.1" />
+    <PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.5.20278.1" />
+    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.5.20278.1" />
+    <PackageReference Include="System.Management" Version="5.0.0-preview.5.20278.1" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.5.20278.1" />
+    <PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.5.20278.1" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.5.20278.1" />
+    <PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.5.20278.1" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.5.20278.1" />
    <!-- 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.0.0" />
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@ -12,7 +12,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.6.20305.6" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.5.20278.1" />
  </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="5.0.0-preview.6.20312.15" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.6.20305.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.0-preview.5.20279.2" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.5.20278.1" />
  </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,6 +14,6 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.6.20305.6" />
+    <PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.5.20278.1" />
  </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="5.0.0-preview.6.20305.6" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.6.20305.6" />
+    <PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.5.20278.1" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.5.20278.1" />
  </ItemGroup>
 </Project>