Hack a no timestamp version of the runtime store and deps file
This commit is contained in:
parent
8102d6a038
commit
485cf19ab6
|
|
@ -15,6 +15,8 @@
|
||||||
<DepsOutputPath>$(MetaPackagePath)bin\deps\</DepsOutputPath>
|
<DepsOutputPath>$(MetaPackagePath)bin\deps\</DepsOutputPath>
|
||||||
<ArtifactsDir>$(RepositoryRoot)artifacts\</ArtifactsDir>
|
<ArtifactsDir>$(RepositoryRoot)artifacts\</ArtifactsDir>
|
||||||
<ArtifactsZipDir>$(ArtifactsDir)zip\</ArtifactsZipDir>
|
<ArtifactsZipDir>$(ArtifactsDir)zip\</ArtifactsZipDir>
|
||||||
|
<ArtifactsZipTimestampDir>$(ArtifactsZipDir)ts\</ArtifactsZipTimestampDir>
|
||||||
|
<ArtifactsZipNoTimestampDir>$(ArtifactsZipDir)nt\</ArtifactsZipNoTimestampDir>
|
||||||
<TempDir>$(ArtifactsDir)temp\</TempDir>
|
<TempDir>$(ArtifactsDir)temp\</TempDir>
|
||||||
<ToolsDir>$(RepositoryRoot)tools\</ToolsDir>
|
<ToolsDir>$(RepositoryRoot)tools\</ToolsDir>
|
||||||
<DependencyBuildDirectory>$(RepositoryRoot).deps\build\</DependencyBuildDirectory>
|
<DependencyBuildDirectory>$(RepositoryRoot).deps\build\</DependencyBuildDirectory>
|
||||||
|
|
@ -47,7 +49,8 @@
|
||||||
<OutputZipSufix Condition="'$(OSPlatform)' == 'Linux'">linux</OutputZipSufix>
|
<OutputZipSufix Condition="'$(OSPlatform)' == 'Linux'">linux</OutputZipSufix>
|
||||||
<OutputZipSufix Condition="'$(OSPlatform)' == 'macOS'">osx</OutputZipSufix>
|
<OutputZipSufix Condition="'$(OSPlatform)' == 'macOS'">osx</OutputZipSufix>
|
||||||
|
|
||||||
<OutputZip>$(ArtifactsDir)Build.RS.$(OutputZipSufix).zip</OutputZip>
|
<OutputZip>$(ArtifactsDir)Build.RS.$(OutputZipSufix)-$(VersionSuffix).zip</OutputZip>
|
||||||
|
<OutputZipNoTimestamp>$(ArtifactsDir)Build.RS.$(OutputZipSufix).zip</OutputZipNoTimestamp>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
@ -74,26 +77,44 @@
|
||||||
<PackageStoreManifestFiles Include="$(PackageCacheOutputPath)%(RIDs.PlatformDir)\**\artifact.xml">
|
<PackageStoreManifestFiles Include="$(PackageCacheOutputPath)%(RIDs.PlatformDir)\**\artifact.xml">
|
||||||
<DestinationFile>manifest.%(RIDs.Identity).xml</DestinationFile>
|
<DestinationFile>manifest.%(RIDs.Identity).xml</DestinationFile>
|
||||||
</PackageStoreManifestFiles>
|
</PackageStoreManifestFiles>
|
||||||
<PackageCacheFiles Include="$(PackageCacheOutputPath)**\*" Exclude="$(PackageCacheOutputPath)**\artifact.xml" />
|
<_PackageCacheFiles Include="$(PackageCacheOutputPath)**\*" Exclude="$(PackageCacheOutputPath)**\artifact.xml" />
|
||||||
|
<PackageCacheFiles Include="@(_PackageCacheFiles)" >
|
||||||
|
<NoTimestampRecursiveDir>$([System.String]::new('%(RecursiveDir)').Replace('-$(BuildNumber)', '-final'))</NoTimestampRecursiveDir>
|
||||||
|
</PackageCacheFiles>
|
||||||
<DepsFiles Include="$(DepsOutputPath)**\*" />
|
<DepsFiles Include="$(DepsOutputPath)**\*" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Move SourceFiles="%(PackageStoreManifestFiles.FullPath)" DestinationFiles="$(ArtifactsDir)%(PackageStoreManifestFiles.DestinationFile)" />
|
<Move SourceFiles="%(PackageStoreManifestFiles.FullPath)" DestinationFiles="$(ArtifactsDir)%(PackageStoreManifestFiles.DestinationFile)" />
|
||||||
|
|
||||||
<Copy SourceFiles="@(PackageCacheFiles)" DestinationFolder="$(ArtifactsZipDir)store\%(RecursiveDir)" />
|
<Copy SourceFiles="@(DepsFiles)" DestinationFolder="$(ArtifactsZipTimestampDir)additionalDeps\%(RecursiveDir)" />
|
||||||
<Copy SourceFiles="@(DepsFiles)" DestinationFolder="$(ArtifactsZipDir)additionalDeps\%(RecursiveDir)" />
|
<Copy SourceFiles="@(PackageCacheFiles)" DestinationFolder="$(ArtifactsZipTimestampDir)store\%(RecursiveDir)" />
|
||||||
|
<Copy SourceFiles="@(DepsFiles)" DestinationFolder="$(ArtifactsZipNoTimestampDir)additionalDeps\%(RecursiveDir)" />
|
||||||
|
<Copy SourceFiles="@(PackageCacheFiles)" DestinationFiles="$(ArtifactsZipNoTimestampDir)store\%(PackageCacheFiles.NoTimestampRecursiveDir)%(PackageCacheFiles.FileName)%(PackageCacheFiles.Extension)" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<OutputZipFiles Include="$(ArtifactsZipDir)**\*" />
|
<NoTimestampDepsFiles Include="$(ArtifactsZipNoTimestampDir)additionalDeps\**\*"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ZipArchive File="$(OutputZip)" SourceFiles="@(OutputZipFiles)" WorkingDirectory="$(ArtifactsZipDir)" />
|
<MSBuild Projects="$(ProjectPath)" Targets="_RemoveTimestampFromDepsFile" Properties="DepsFile=%(NoTimestampDepsFiles.FullPath)" />
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<OutputZipFiles Include="$(ArtifactsZipTimestampDir)**\*" />
|
||||||
|
<OutputZipFilesNoTimestamp Include="$(ArtifactsZipNoTimestampDir)**\*" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ZipArchive File="$(OutputZip)" SourceFiles="@(OutputZipFiles)" WorkingDirectory="$(ArtifactsZipTimestampDir)" />
|
||||||
|
<ZipArchive File="$(OutputZipNoTimeStamp)" SourceFiles="@(OutputZipFilesNoTimestamp)" WorkingDirectory="$(ArtifactsZipNoTimestampDir)" />
|
||||||
|
|
||||||
<!--Drop a nuspec file in artifacts for packing zip files into a nupkg-->
|
<!--Drop a nuspec file in artifacts for packing zip files into a nupkg-->
|
||||||
<Copy SourceFiles="$(RepositoryRoot)build\Build.RS.nuspec" DestinationFolder="$(ArtifactsDir)" Condition="'$(OSPlatform)'=='Windows'" />
|
<Copy SourceFiles="$(RepositoryRoot)build\Build.RS.nuspec" DestinationFolder="$(ArtifactsDir)" Condition="'$(OSPlatform)'=='Windows'" />
|
||||||
<WriteLinesToFile File="$(ArtifactsDir)version.txt" Lines="$(VersionPrefix)-$(VersionSuffix)" Overwrite="true" Condition="'$(OSPlatform)'=='Windows'" />
|
<WriteLinesToFile File="$(ArtifactsDir)version.txt" Lines="$(VersionPrefix)-$(VersionSuffix)" Overwrite="true" Condition="'$(OSPlatform)'=='Windows'" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
|
<Target Name="_RemoveTimestampFromDepsFile">
|
||||||
|
<Exec Command="powershell.exe -command "(Get-Content $(DepsFile)).replace('-$(BuildNumber)','-final') | Set-Content $(DepsFile)"" Condition="'$(OSPlatform)'=='Windows'"/>
|
||||||
|
<Exec Command="sed -i -e "s/-$(BuildNumber)/-final/g" $(DepsFile)" Condition="'$(OSPlatform)'!='Windows'"/>
|
||||||
|
</Target>
|
||||||
|
|
||||||
<Target Name="_BuildFallbackArchive">
|
<Target Name="_BuildFallbackArchive">
|
||||||
<Error Text="AspNetPackageVersion must be specified" Condition=" '$(AspNetPackageVersion)' == '' " />
|
<Error Text="AspNetPackageVersion must be specified" Condition=" '$(AspNetPackageVersion)' == '' " />
|
||||||
<Error Text="PackageSource must be specified" Condition=" '$(PackageSource)' == '' " />
|
<Error Text="PackageSource must be specified" Condition=" '$(PackageSource)' == '' " />
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue