huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9228 from dotnet-maestro-bot/merge/release/3.0-preview4-to-master 

[automated] Merge branch 'release/3.0-preview4' => 'master'
This commit is contained in:
Andrew Stanton-Nurse 2019-04-09 21:54:58 -07:00 committed by GitHub
parent 3e056db750 d1c7e90b98
commit 9158039c95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eng/Versions.props
View File

@ -174,8 +174,8 @@
<CastleCorePackageVersion>4.2.1</CastleCorePackageVersion> <CastleCorePackageVersion>4.2.1</CastleCorePackageVersion>
<FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion> <FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
<GoogleProtobufPackageVersion>3.7.0</GoogleProtobufPackageVersion> <GoogleProtobufPackageVersion>3.7.0</GoogleProtobufPackageVersion>
<GrpcAspNetCoreServerPackageVersion>0.1.19-pre2</GrpcAspNetCoreServerPackageVersion> <GrpcAspNetCoreServerPackageVersion>0.1.20-pre1</GrpcAspNetCoreServerPackageVersion>
<GrpcToolsPackageVersion>1.20.0-pre1</GrpcToolsPackageVersion> <GrpcToolsPackageVersion>1.20.0-pre3</GrpcToolsPackageVersion>
<IdentityServer4AspNetIdentityPackageVersion>3.0.0-preview3.4</IdentityServer4AspNetIdentityPackageVersion> <IdentityServer4AspNetIdentityPackageVersion>3.0.0-preview3.4</IdentityServer4AspNetIdentityPackageVersion>
<IdentityServer4EntityFrameworkPackageVersion>3.0.0-preview3.4</IdentityServer4EntityFrameworkPackageVersion> <IdentityServer4EntityFrameworkPackageVersion>3.0.0-preview3.4</IdentityServer4EntityFrameworkPackageVersion>
<IdentityServer4PackageVersion>3.0.0-preview3.4</IdentityServer4PackageVersion> <IdentityServer4PackageVersion>3.0.0-preview3.4</IdentityServer4PackageVersion>

2
src/Framework/Directory.Build.props
View File

@ -7,7 +7,7 @@
<PropertyGroup> <PropertyGroup>
<!-- Shared between targeting pack and runtime build. --> <!-- Shared between targeting pack and runtime build. -->
<PlatformManifestFileName>Microsoft.AspNetCore.App.PlatformManifest.txt</PlatformManifestFileName> <PlatformManifestFileName>PlatformManifest.txt</PlatformManifestFileName>
<PlatformManifestOutputPath>$(ArtifactsObjDir)$(PlatformManifestFileName)</PlatformManifestOutputPath> <PlatformManifestOutputPath>$(ArtifactsObjDir)$(PlatformManifestFileName)</PlatformManifestOutputPath>
</PropertyGroup> </PropertyGroup>

2
src/Framework/test/TargetingPackTests.cs
View File

@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore
[Fact] [Fact]
public void PlatformManifestListsAllFiles() public void PlatformManifestListsAllFiles()
{ {
var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "Microsoft.AspNetCore.App.PlatformManifest.txt"); var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt");
var expectedAssemblies = TestData.GetSharedFxDependencies() var expectedAssemblies = TestData.GetSharedFxDependencies()
.Split(';', StringSplitOptions.RemoveEmptyEntries) .Split(';', StringSplitOptions.RemoveEmptyEntries)
.ToHashSet(); .ToHashSet();