Merge in 'release/5.0' changes

dotnet · Dec 12, 2020 · cb5f173 · cb5f173
2 parents 1cd455b + 988fa3b
commit cb5f173
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/...rosoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj b/...rosoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks>
+    <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Microsoft.Extensions.DependencyInjection.cs" />

diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/Directory.Build.props b/src/libraries/System.Diagnostics.DiagnosticSource/Directory.Build.props
@@ -2,5 +2,8 @@
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <StrongNameKeyId>Open</StrongNameKeyId>
+    <PackageVersion>5.0.1</PackageVersion>   
+    <AssemblyVersion Condition="$(TargetFramework.StartsWith('net4'))">5.0.0.1</AssemblyVersion>
+    <SkipValidatePackage>true</SkipValidatePackage>
   </PropertyGroup>
 </Project>
diff --git a/src/libraries/System.Text.Json/Directory.Build.props b/src/libraries/System.Text.Json/Directory.Build.props
@@ -3,5 +3,7 @@
   <PropertyGroup>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <PackageVersion>5.0.1</PackageVersion>
+    <AssemblyVersion Condition="$(TargetFramework.StartsWith('net4'))">5.0.0.1</AssemblyVersion>
+    <SkipValidatePackage>true</SkipValidatePackage>
   </PropertyGroup>
 </Project>
diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj
@@ -20,6 +20,7 @@
     <!-- 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>
 

diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json
@@ -2536,7 +2536,8 @@
         "4.0.3.0": "4.5.0",
         "4.0.3.1": "4.5.1",
         "4.0.4.0": "4.6.0",
-        "5.0.0.0": "5.0.0"
+        "5.0.0.0": "5.0.0",
+        "5.0.0.1": "5.0.1"
       }
     },
     "System.Diagnostics.EventLog": {
@@ -6406,7 +6407,8 @@
       },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.6.0",
-        "5.0.0.0": "5.0.0"
+        "5.0.0.0": "5.0.0",
+        "5.0.0.1": "5.0.1"
       }
     },
     "System.Text.RegularExpressions": {