Skip to content

[release/3.1] Add .version file to shared framework zip #21548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 13, 2020
Merged

[release/3.1] Add .version file to shared framework zip #21548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5680f38
Add .version file to shared framework zip
wtgodbe May 6, 2020
f2d4c77
Fix test
wtgodbe May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. -->
<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. -->
<DebugType>none</DebugType>
Expand Down Expand Up @@ -256,7 +257,12 @@ This package is an internal implementation of the .NET Core SDK and is not meant
</ItemGroup>

<WriteLinesToFile
File="$(VersionFileIntermediateOutputPath)"
File="$(VersionTxtFileIntermediateOutputPath)"
Lines="@(VersionLines)"
Overwrite="true" />

<WriteLinesToFile
File="$(DotVersionFileIntermediateOutputPath)"
Lines="@(VersionLines)"
Overwrite="true" />
</Target>
Expand Down Expand Up @@ -397,7 +403,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant

<Target Name="_ResolveSharedFrameworkContent" DependsOnTargets="ResolveReferences;Crossgen">
<ItemGroup>
<SharedFxContent Include="$(VersionFileIntermediateOutputPath)" />
<SharedFxContent Include="$(DotVersionFileIntermediateOutputPath)" />
<SharedFxContent Include="$(ProjectDepsFilePath)" />
<SharedFxContent Include="$(ProjectRuntimeConfigFilePath)" />
<SharedFxContent Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)' != '.pdb'" />
Expand Down Expand Up @@ -496,7 +502,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
BeforeTargets="_GetPackageFiles">

<ItemGroup>
<None Include="$(VersionFileIntermediateOutputPath)" Pack="true" PackagePath="." />
<None Include="$(VersionTxtFileIntermediateOutputPath)" Pack="true" PackagePath="." />
</ItemGroup>
</Target>

Expand Down
2 changes: 1 addition & 1 deletion src/Framework/test/SharedFxTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public void ItContainsValidDepsJson()
[Fact]
public void ItContainsVersionFile()
{
var versionFile = Path.Combine(_sharedFxRoot, "Microsoft.AspNetCore.App.versions.txt");
var versionFile = Path.Combine(_sharedFxRoot, ".version");
AssertEx.FileExists(versionFile);
var lines = File.ReadAllLines(versionFile);
Assert.Equal(2, lines.Length);
Expand Down