diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2020-12-12 04:34:29 +0300 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2020-12-12 04:34:29 +0300 |
| commit | cb5f173b9696d9d00a544b953d95190ab3b56df2 (patch) | |
| tree | b9e783a7ecf0ae902122d5b18bcd278ad531b184 | |
| parent | 1cd455b20b68a9ef53caf48f6616774af4ca436b (diff) | |
| parent | 988fa3b75f8d0d1f11ee0c2856ecdfeefea2cd27 (diff) | |
Merge in 'release/5.0' changesv5.0.2
5 files changed, 11 insertions, 2 deletions
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj index b1b514112a7..db755870d00 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/libraries/Microsoft.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 index bdcfca3b543..819d782564d 100644 --- 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>
\ No newline at end of file diff --git a/src/libraries/System.Text.Json/Directory.Build.props b/src/libraries/System.Text.Json/Directory.Build.props index 8621b8105cf..a1cafc714cd 100644 --- 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 index 3a910172e8e..fd05eff386d 100644 --- 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 index 3a0cc6a50e3..5fc9da144f6 100644 --- 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": { |