Merge pull request #46888 from Anipik/branding503

Internal Code Merge and update branding to 5.0.3
dotnet · Jan 14, 2021 · 9874123 · 9874123
2 parents 17fc554 + 18bc2c4
commit 9874123
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 16 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -1,11 +1,11 @@
 <Project>
   <PropertyGroup>
     <!-- The .NET product branding version -->
-    <ProductVersion>5.0.2</ProductVersion>
+    <ProductVersion>5.0.3</ProductVersion>
     <!-- File version numbers -->
     <MajorVersion>5</MajorVersion>
     <MinorVersion>0</MinorVersion>
-    <PatchVersion>2</PatchVersion>
+    <PatchVersion>3</PatchVersion>
     <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
     <!-- Set assembly version to align with major and minor version,
          as for the patches and revisions should be manually updated per assembly if it is serviced. -->

diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh
@@ -169,12 +169,14 @@ EOF
     export CXXFLAGS="${CXXFLAGS} ${EXTRA_CXXFLAGS}"
     export LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}"
 
+    local exit_code
     if [[ "$__StaticAnalyzer" == 1 ]]; then
         pushd "$intermediatesDir"
 
         buildTool="$SCAN_BUILD_COMMAND -o $__BinDir/scan-build-log $buildTool"
         echo "Executing $buildTool install -j $__NumProc"
         "$buildTool" install -j "$__NumProc"
+        exit_code="$?"
 
         popd
     else
@@ -185,13 +187,13 @@ EOF
 
         echo "Executing $cmake_command --build \"$intermediatesDir\" --target install -- -j $__NumProc"
         $cmake_command --build "$intermediatesDir" --target install -- -j "$__NumProc"
+        exit_code="$?"
     fi
 
     CFLAGS="${SAVED_CFLAGS}"
     CXXFLAGS="${SAVED_CXXFLAGS}"
     LDFLAGS="${SAVED_LDFLAGS}"
 
-    local exit_code="$?"
     if [[ "$exit_code" != 0 ]]; then
         echo "${__ErrMsgPrefix}Failed to build \"$message\"."
         exit "$exit_code"

diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj
@@ -18,10 +18,6 @@
     <ProjectReference Include="$(PkgDir)*\*.proj" Exclude="$(PkgDir)test\*" Condition="'$(BuildAllOOBPackages)' == 'true'" />
     <ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\**\*.pkgproj" Condition="('$(BuildAllConfigurations)' == 'true' or '$(DotNetBuildFromSource)' == 'true') And '$(BuildAllOOBPackages)' == 'true'" />
     <!-- If setting BuildAllOOBPackages to false, add bellow the individual OOB packages you want to continue to build -->
-    <ProjectReference Include="$(LibrariesProjectRoot)\pkg\Microsoft.Windows.Compatibility\Microsoft.Windows.Compatibility.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
-    <ProjectReference Include="$(LibrariesProjectRoot)\System.Text.Json\pkg\System.Text.Json.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
-    <ProjectReference Include="$(LibrariesProjectRoot)\System.Diagnostics.DiagnosticSource\pkg\System.Diagnostics.DiagnosticSource.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
-    <ProjectReference Include="$(LibrariesProjectRoot)\System.Composition*\pkg\System.Composition*.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
   </ItemGroup>
 
   <!-- Need the PackageIndexFile file property from baseline.props -->

diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json
@@ -1313,7 +1313,8 @@
         "2.1.1",
         "3.0.0",
         "3.0.1",
-        "5.0.0"
+        "5.0.0",
+        "5.0.1"
       ],
       "InboxOn": {}
     },
@@ -2062,7 +2063,8 @@
         "1.1.0",
         "1.2.0",
         "1.3.0",
-        "5.0.0"
+        "5.0.0",
+        "5.0.1"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {}
@@ -2073,7 +2075,8 @@
         "1.1.0",
         "1.2.0",
         "1.3.0",
-        "5.0.0"
+        "5.0.0",
+        "5.0.1"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -2091,7 +2094,8 @@
         "1.1.0",
         "1.2.0",
         "1.3.0",
-        "5.0.0"
+        "5.0.0",
+        "5.0.1"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -2109,7 +2113,8 @@
         "1.1.0",
         "1.2.0",
         "1.3.0",
-        "5.0.0"
+        "5.0.0",
+        "5.0.1"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -2127,7 +2132,8 @@
         "1.1.0",
         "1.2.0",
         "1.3.0",
-        "5.0.0"
+        "5.0.0",
+        "5.0.1"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -2145,7 +2151,8 @@
         "1.1.0",
         "1.2.0",
         "1.3.0",
-        "5.0.0"
+        "5.0.0",
+        "5.0.1"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -2519,7 +2526,8 @@
         "4.5.0",
         "4.5.1",
         "4.6.0",
-        "5.0.0"
+        "5.0.0",
+        "5.0.1"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -6398,7 +6406,8 @@
     "System.Text.Json": {
       "StableVersions": [
         "4.6.0",
-        "5.0.0"
+        "5.0.0",
+        "5.0.1"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {