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

Add .version file to shared framework zip (#21587) 

* Add .version file to shared framework zip

* Fix test

* Test for proper version file depending on env
This commit is contained in:
William Godbe 2020-05-12 17:10:02 -07:00 committed by GitHub
parent 9a5d3c7640
commit 7c58b8b767
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
View File

@ -67,7 +67,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<!-- There is no way to suppress the .dev.runtimeconfig.json generation. --> <!-- There is no way to suppress the .dev.runtimeconfig.json generation. -->
<ProjectRuntimeConfigDevFilePath>$(IntermediateOutputPath)ignoreme.dev.runtimeconfig.json</ProjectRuntimeConfigDevFilePath> <ProjectRuntimeConfigDevFilePath>$(IntermediateOutputPath)ignoreme.dev.runtimeconfig.json</ProjectRuntimeConfigDevFilePath>
<VersionFileIntermediateOutputPath>$(IntermediateOutputPath)$(SharedFxName).versions.txt</VersionFileIntermediateOutputPath> <VersionTxtFileIntermediateOutputPath>$(IntermediateOutputPath)$(SharedFxName).versions.txt</VersionTxtFileIntermediateOutputPath>
<DotVersionFileIntermediateOutputPath>$(IntermediateOutputPath).version</DotVersionFileIntermediateOutputPath>
<!-- The project representing the shared framework doesn't produce a .NET assembly or symbols. --> <!-- The project representing the shared framework doesn't produce a .NET assembly or symbols. -->
<DebugType>none</DebugType> <DebugType>none</DebugType>
@ -259,7 +260,12 @@ This package is an internal implementation of the .NET Core SDK and is not meant
</ItemGroup> </ItemGroup>
<WriteLinesToFile <WriteLinesToFile
File="$(VersionFileIntermediateOutputPath)" File="$(VersionTxtFileIntermediateOutputPath)"
Lines="@(VersionLines)"
Overwrite="true" />
<WriteLinesToFile
File="$(DotVersionFileIntermediateOutputPath)"
Lines="@(VersionLines)" Lines="@(VersionLines)"
Overwrite="true" /> Overwrite="true" />
</Target> </Target>
@ -402,7 +408,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<Target Name="_ResolveSharedFrameworkContent" DependsOnTargets="ResolveReferences;Crossgen"> <Target Name="_ResolveSharedFrameworkContent" DependsOnTargets="ResolveReferences;Crossgen">
<ItemGroup> <ItemGroup>
<SharedFxContent Include="$(VersionFileIntermediateOutputPath)" /> <SharedFxContent Include="$(DotVersionFileIntermediateOutputPath)" />
<SharedFxContent Include="$(ProjectDepsFilePath)" /> <SharedFxContent Include="$(ProjectDepsFilePath)" />
<SharedFxContent Include="$(ProjectRuntimeConfigFilePath)" /> <SharedFxContent Include="$(ProjectRuntimeConfigFilePath)" />
<SharedFxContent Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)' != '.pdb'" /> <SharedFxContent Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)' != '.pdb'" />
@ -501,7 +507,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
BeforeTargets="_GetPackageFiles"> BeforeTargets="_GetPackageFiles">
<ItemGroup> <ItemGroup>
<None Include="$(VersionFileIntermediateOutputPath)" Pack="true" PackagePath="." /> <None Include="$(VersionTxtFileIntermediateOutputPath)" Pack="true" PackagePath="." />
</ItemGroup> </ItemGroup>
</Target> </Target>

4
src/Framework/test/SharedFxTests.cs
View File

@ -15,6 +15,7 @@ namespace Microsoft.AspNetCore
{ {
private readonly string _expectedTfm; private readonly string _expectedTfm;
private readonly string _expectedRid; private readonly string _expectedRid;
private readonly string _expectedVersionFileName;
private readonly string _sharedFxRoot; private readonly string _sharedFxRoot;
private readonly ITestOutputHelper _output; private readonly ITestOutputHelper _output;
@ -26,6 +27,7 @@ namespace Microsoft.AspNetCore
_sharedFxRoot = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH")) _sharedFxRoot = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH"))
? Path.Combine(TestData.GetTestDataValue("SharedFrameworkLayoutRoot"), "shared", TestData.GetTestDataValue("RuntimePackageVersion")) ? Path.Combine(TestData.GetTestDataValue("SharedFrameworkLayoutRoot"), "shared", TestData.GetTestDataValue("RuntimePackageVersion"))
: Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH"); : Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH");
_expectedVersionFileName = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH")) ? ".version" : "Microsoft.AspNetCore.App.versions.txt";
} }
[Fact] [Fact]
@ -133,7 +135,7 @@ namespace Microsoft.AspNetCore
[Fact] [Fact]
public void ItContainsVersionFile() public void ItContainsVersionFile()
{ {
var versionFile = Path.Combine(_sharedFxRoot, "Microsoft.AspNetCore.App.versions.txt"); var versionFile = Path.Combine(_sharedFxRoot, _expectedVersionFileName);
AssertEx.FileExists(versionFile); AssertEx.FileExists(versionFile);
var lines = File.ReadAllLines(versionFile); var lines = File.ReadAllLines(versionFile);
Assert.Equal(2, lines.Length); Assert.Equal(2, lines.Length);