Merge pull request #42962 from Anipik/branding

Update Branding to 3.1.8
dotnet · Aug 12, 2020 · 9dc2b1e · 9dc2b1e
2 parents ad72601 + c43db29
commit 9dc2b1e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 23 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,16 +1,16 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.4-servicing.20315.1">
+    <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.4-servicing.20366.2">
       <Uri>https://github.com/dotnet/coreclr</Uri>
-      <Sha>20ee1c47c2bcec0101e3cf04c98549aeffe85989</Sha>
+      <Sha>e8b17841cb5ce923aec48a1b0c12042d445d508f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.4-servicing.20315.1">
+    <Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.4-servicing.20366.2">
       <Uri>https://github.com/dotnet/coreclr</Uri>
-      <Sha>20ee1c47c2bcec0101e3cf04c98549aeffe85989</Sha>
+      <Sha>e8b17841cb5ce923aec48a1b0c12042d445d508f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.IL" Version="3.1.4-servicing.20315.1">
+    <Dependency Name="Microsoft.NET.Sdk.IL" Version="3.1.4-servicing.20366.2">
       <Uri>https://github.com/dotnet/coreclr</Uri>
-      <Sha>20ee1c47c2bcec0101e3cf04c98549aeffe85989</Sha>
+      <Sha>e8b17841cb5ce923aec48a1b0c12042d445d508f</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <!-- The .NET Core product branding version -->
-    <ProductVersion>3.1.7</ProductVersion>
+    <ProductVersion>3.1.8</ProductVersion>
     <!-- We need to move to 4.7 as part of our versioning change when we switch to arcade to avoid downgrading versions -->
     <MajorVersion>4</MajorVersion>
     <MinorVersion>7</MinorVersion>
@@ -51,9 +51,9 @@
     <MicrosoftNETCoreDotNetHostPackageVersion>3.1.0-preview3.19553.2</MicrosoftNETCoreDotNetHostPackageVersion>
     <MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.1.0-preview3.19553.2</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
     <!-- Coreclr dependencies -->
-    <MicrosoftNETSdkILPackageVersion>3.1.4-servicing.20315.1</MicrosoftNETSdkILPackageVersion>
-    <MicrosoftNETCoreILAsmPackageVersion>3.1.4-servicing.20315.1</MicrosoftNETCoreILAsmPackageVersion>
-    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.1.4-servicing.20315.1</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
+    <MicrosoftNETSdkILPackageVersion>3.1.4-servicing.20366.2</MicrosoftNETSdkILPackageVersion>
+    <MicrosoftNETCoreILAsmPackageVersion>3.1.4-servicing.20366.2</MicrosoftNETCoreILAsmPackageVersion>
+    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.1.4-servicing.20366.2</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
     <!-- Corefx dependencies -->
     <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview9.19409.15</MicrosoftNETCorePlatformsPackageVersion>
     <runtimenativeSystemIOPortsPackageVersion>4.6.0-preview9.19409.15</runtimenativeSystemIOPortsPackageVersion>

diff --git a/global.json b/global.json
@@ -12,6 +12,6 @@
     "Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.20213.4",
     "Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.20213.4",
     "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
-    "Microsoft.NET.Sdk.IL": "3.1.4-servicing.20315.1"
+    "Microsoft.NET.Sdk.IL": "3.1.4-servicing.20366.2"
   }
 }
diff --git a/src/packages.builds b/src/packages.builds
@@ -26,18 +26,6 @@
       <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
     </Project>
     <!-- add specific builds / pkgproj's here to include in servicing builds -->
-    <Project Include="$(MSBuildThisFileDirectory)Microsoft.IO.Redist\pkg\Microsoft.IO.Redist.pkgproj">
-      <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
-    </Project>
-    <Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.NETCore.Platforms\Microsoft.NETCore.Platforms.builds">
-      <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
-    </Project>
-    <Project Include="$(MSBuildThisFileDirectory)System.Data.SqlClient\pkg\System.Data.SqlClient.pkgproj">
-      <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
-    </Project>
-    <Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.Windows.Compatibility\Microsoft.Windows.Compatibility.builds">
-      <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
-    </Project>
   </ItemGroup>
 
   <ItemGroup>