Merge branch 'master' into merges/release/3.0.1xx-to-master
This commit is contained in:
commit
ba3c7d664a
2 changed files with 3 additions and 3 deletions
|
@ -6,9 +6,9 @@
|
|||
<Uri>https://devdiv.visualstudio.com/DevDiv/_git/DotNet-Trusted</Uri>
|
||||
<Sha>cec5867556ba6778f958f0600a92d3728acc19cc</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview4-27421-3">
|
||||
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview4-27423-1">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>c38cd49ad5eee02e20e7e76dadac6b51cff035fb</Sha>
|
||||
<Sha>e1e36e48fb64a7637cbb3d340e44fb97256dfb3c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App" Version="3.0.0-preview3-19122-14">
|
||||
<Uri>https://github.com/aspnet/AspNetCore</Uri>
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview4.19111.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview3-27422-6</MicrosoftNETCoreAppPackageVersion>
|
||||
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview4-27423-1</MicrosoftNETCoreAppPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
|
|
Loading…
Reference in a new issue