Skip to content

Commit

Permalink
Merge in 'release/5.0' changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-bot committed Dec 12, 2020
2 parents 1cd455b + 988fa3b commit cb5f173
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 2 additions & 0 deletions src/libraries/System.Text.Json/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
1 change: 1 addition & 0 deletions src/libraries/libraries-packages.proj
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 4 additions & 2 deletions src/libraries/pkg/baseline/packageIndex.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down

0 comments on commit cb5f173

Please sign in to comment.