mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Rename Stage0 build variables to PreviousStage

Browse source 
(cherry picked from commit c6e4c8f477)
This commit is contained in:
Daniel Plaisted 2017-08-11 16:13:43 -07:00 committed by Nick Guerrera
parent c665fd3654
commit ca34332205
14 changed files with 23 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Directory.Build.props
View file

@ -47,7 +47,7 @@ tools\TestAssetsDependencies\TestAssetsDependencies.csproj
<Import Project="build/FileExtensions.props" /> <Import Project="build/FileExtensions.props" />
<Import Project="build/InputDirectories.props" /> <Import Project="build/InputDirectories.props" />
<Import Project="build/MSBuildExtensions.props" /> <Import Project="build/MSBuildExtensions.props" />
<Import Project="build/Stage0.props" /> <Import Project="build/SetupPreviousStage.props" />
<Import Project="build/OutputDirectories.props" /> <Import Project="build/OutputDirectories.props" />
<Import Project="build/BuildDefaults.props" /> <Import Project="build/BuildDefaults.props" />
<Import Project="build/VersionBadge.props" /> <Import Project="build/VersionBadge.props" />

2
Microsoft.DotNet.Cli.sln
View file

@ -54,7 +54,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
build\RestoreDependency.proj = build\RestoreDependency.proj build\RestoreDependency.proj = build\RestoreDependency.proj
build\sdks\sdks.csproj = build\sdks\sdks.csproj build\sdks\sdks.csproj = build\sdks\sdks.csproj
build\Signing.proj = build\Signing.proj build\Signing.proj = build\Signing.proj
build\Stage0.props = build\Stage0.props build\SetupPreviousStage.props = build\SetupPreviousStage.props
build\Test.targets = build\Test.targets build\Test.targets = build\Test.targets
build\Version.props = build\Version.props build\Version.props = build\Version.props
build\VersionBadge.props = build\VersionBadge.props build\VersionBadge.props = build\VersionBadge.props

4
build.proj
View file

@ -20,7 +20,7 @@
DependsOnTargets="MSBuildWorkaroundTarget; DependsOnTargets="MSBuildWorkaroundTarget;
RestoreDotnetCliBuildFramework"> RestoreDotnetCliBuildFramework">
<Exec Command="$(DotnetStage0) publish --no-restore -o $(DotnetCliBuildDirectory)/bin --framework netcoreapp2.0 /p:GeneratePropsFile=$(GeneratePropsFile)" <Exec Command="$(PreviousStageDotnet) publish --no-restore -o $(DotnetCliBuildDirectory)/bin --framework $(CliTargetFramework) /p:GeneratePropsFile=$(GeneratePropsFile)"
WorkingDirectory="$(DotnetCliBuildDirectory)"/> WorkingDirectory="$(DotnetCliBuildDirectory)"/>
</Target> </Target>
@ -39,7 +39,7 @@
<ExtraRestoreArgs Condition="'$(OS)' != 'Windows_NT'">$(ExtraRestoreArgs) --disable-parallel</ExtraRestoreArgs> <ExtraRestoreArgs Condition="'$(OS)' != 'Windows_NT'">$(ExtraRestoreArgs) --disable-parallel</ExtraRestoreArgs>
</PropertyGroup> </PropertyGroup>
<Exec Command="$(DotnetStage0) restore $(ExtraRestoreArgs)" <Exec Command="$(PreviousStageDotnet) restore $(ExtraRestoreArgs)"
WorkingDirectory="$(DotnetCliBuildDirectory)"/> WorkingDirectory="$(DotnetCliBuildDirectory)"/>
</Target> </Target>

2
build/BundledTemplates.proj
View file

@ -23,7 +23,7 @@
<Target Name="EnsureTemplateRestored" <Target Name="EnsureTemplateRestored"
Condition="!Exists('$(TemplateNuPkgPath)/$(TemplatePackageName.ToLower()).nuspec')"> Condition="!Exists('$(TemplateNuPkgPath)/$(TemplatePackageName.ToLower()).nuspec')">
<DotNetRestore ToolPath="$(Stage0Directory)" <DotNetRestore ToolPath="$(PreviousStageDirectory)"
ProjectPath="$(MSBuildThisFileDirectory)/templates/templates.csproj" ProjectPath="$(MSBuildThisFileDirectory)/templates/templates.csproj"
AdditionalParameters="/p:TemplatePackageName=$(TemplatePackageName) /p:TemplatePackageVersion=$(TemplatePackageVersion)" /> AdditionalParameters="/p:TemplatePackageName=$(TemplatePackageName) /p:TemplatePackageVersion=$(TemplatePackageVersion)" />
</Target> </Target>

2
build/MSBuildExtensions.targets
View file

@ -75,7 +75,7 @@
NuGetPackagesDir=$(NuGetPackagesDir); NuGetPackagesDir=$(NuGetPackagesDir);
DependencyPackageName=%(ExtensionPackageToRestore.Identity); DependencyPackageName=%(ExtensionPackageToRestore.Identity);
DependencyPackageVersion=%(ExtensionPackageToRestore.Version); DependencyPackageVersion=%(ExtensionPackageToRestore.Version);
Stage0Directory=$(Stage0Directory) PreviousStageDirectory=$(PreviousStageDirectory)
</Properties> </Properties>
</ExtensionRestore> </ExtensionRestore>
</ItemGroup> </ItemGroup>

4
build/Prepare.targets
View file

@ -54,7 +54,7 @@
<CallTarget Targets="CleanSrcLockFiles" /> <CallTarget Targets="CleanSrcLockFiles" />
<DotNetRestore ToolPath="$(Stage0Directory)" <DotNetRestore ToolPath="$(PreviousStageDirectory)"
ProjectPath="&quot;%(RestoreSrcPackagesInput.FullPath)&quot;" /> ProjectPath="&quot;%(RestoreSrcPackagesInput.FullPath)&quot;" />
</Target> </Target>
@ -79,7 +79,7 @@
<CallTarget Targets="CleanToolsLockFiles" /> <CallTarget Targets="CleanToolsLockFiles" />
<DotNetRestore ToolPath="$(Stage0Directory)" <DotNetRestore ToolPath="$(PreviousStageDirectory)"
ProjectPath="&quot;%(RestoreToolsPackagesInput.FullPath)&quot;" ProjectPath="&quot;%(RestoreToolsPackagesInput.FullPath)&quot;"
AdditionalParameters="/p:UsePortableLinuxSharedFramework=$(UsePortableLinuxSharedFramework)" /> AdditionalParameters="/p:UsePortableLinuxSharedFramework=$(UsePortableLinuxSharedFramework)" />

2
build/RestoreDependency.proj
View file

@ -33,7 +33,7 @@
<Target Name="EnsureDependencyRestored" <Target Name="EnsureDependencyRestored"
Condition="!Exists('$(DependencyNuPkgPath)/$(DependencyPackageName.ToLower()).nuspec')"> Condition="!Exists('$(DependencyNuPkgPath)/$(DependencyPackageName.ToLower()).nuspec')">
<DotNetRestore ToolPath="$(Stage0Directory)" <DotNetRestore ToolPath="$(PreviousStageDirectory)"
ProjectPath="$(MSBuildThisFileDirectory)/sdks/sdks.csproj" ProjectPath="$(MSBuildThisFileDirectory)/sdks/sdks.csproj"
AdditionalParameters="/p:DependencyPackageName=$(DependencyPackageName) /p:DependencyPackageVersion=$(DependencyPackageVersion)" /> AdditionalParameters="/p:DependencyPackageName=$(DependencyPackageName) /p:DependencyPackageVersion=$(DependencyPackageVersion)" />
</Target> </Target>

10
build/Stage0.props → build/SetupPreviousStage.props
View file

@ -1,16 +1,10 @@
<Project> <Project>
<PropertyGroup Condition="'$(PreviousStageProps)' == ''"> <PropertyGroup Condition="'$(PreviousStageProps)' == ''">
<Stage0Directory>$(RepoRoot)/.dotnet_stage0/$(Architecture)</Stage0Directory> <PreviousStageDirectory>$(RepoRoot)/.dotnet_stage0/$(Architecture)</PreviousStageDirectory>
<DotnetStage0>$(Stage0Directory)/dotnet$(ExeExtension)</DotnetStage0> <PreviousStageDotnet>$(PreviousStageDirectory)/dotnet$(ExeExtension)</PreviousStageDotnet>
</PropertyGroup> </PropertyGroup>
<Import Project="$(PreviousStageProps)" Condition="'$(PreviousStageProps)' != ''" /> <Import Project="$(PreviousStageProps)" Condition="'$(PreviousStageProps)' != ''" />
<PropertyGroup Condition="'$(PreviousStageProps)' != ''">
<Stage0Directory>$(PreviousStageDirectory)</Stage0Directory>
<DotnetStage0>$(PreviousStageDotnet)</DotnetStage0>
</PropertyGroup>
<PropertyGroup> <PropertyGroup>
<IsDesktopAvailable>False</IsDesktopAvailable> <IsDesktopAvailable>False</IsDesktopAvailable>

2
build/Test.targets
View file

@ -88,6 +88,6 @@
<Target Name="EnsureStageSeparation"> <Target Name="EnsureStageSeparation">
<DotNetMSBuild Arguments="/v:diag $(RepoRoot)/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage0.proj /p:OutputDirectory=&quot;$(OutputDirectory)&quot;" <DotNetMSBuild Arguments="/v:diag $(RepoRoot)/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage0.proj /p:OutputDirectory=&quot;$(OutputDirectory)&quot;"
ToolPath="$(Stage0Directory)" /> ToolPath="$(PreviousStageDirectory)" />
</Target> </Target>
</Project> </Project>

4
build/package/Installer.DEB.proj
View file

@ -64,7 +64,7 @@
Mode="u+x" /> Mode="u+x" />
<!-- Build SDK Deb package --> <!-- Build SDK Deb package -->
<DotNetDebTool ToolPath="$(Stage0Directory)" <DotNetDebTool ToolPath="$(PreviousStageDirectory)"
InputDirectory="$(LayoutDirectory)" InputDirectory="$(LayoutDirectory)"
OutputDirectory="$(DotNetDebToolOutputDirectory)" OutputDirectory="$(DotNetDebToolOutputDirectory)"
PackageName="$(SdkDebianPackageName)" PackageName="$(SdkDebianPackageName)"
@ -159,7 +159,7 @@
<Target Name="PrepareDotnetDebTool" <Target Name="PrepareDotnetDebTool"
DependsOnTargets="WriteDotnetDebToolProject"> DependsOnTargets="WriteDotnetDebToolProject">
<DotNetRestore ToolPath="$(Stage0Directory)" <DotNetRestore ToolPath="$(PreviousStageDirectory)"
WorkingDirectory="$(DotnetDebToolDir)" /> WorkingDirectory="$(DotnetDebToolDir)" />
</Target> </Target>

2
build/package/Installer.MSI.targets
View file

@ -199,7 +199,7 @@
<Exec Command ="powershell -NoProfile -NoLogo $(SdkTestMsiPowershellScript) <Exec Command ="powershell -NoProfile -NoLogo $(SdkTestMsiPowershellScript)
-InputMsi '$(SdkInstallerFile)' -InputMsi '$(SdkInstallerFile)'
-DotnetDir '$(Stage0Directory)'" /> -DotnetDir '$(PreviousStageDirectory)'" />
<WriteLinesToFile <WriteLinesToFile
File="$(SdkMsiTestedSentinel)" File="$(SdkMsiTestedSentinel)"

4
build/package/Nupkg.targets
View file

@ -24,7 +24,7 @@
<DotNetPack NoBuild="True" <DotNetPack NoBuild="True"
Output="$(PackagesDirectory)" Output="$(PackagesDirectory)"
ProjectPath="%(ProjectsToPack.Identity)/%(ProjectsToPack.ProjectName).csproj" ProjectPath="%(ProjectsToPack.Identity)/%(ProjectsToPack.ProjectName).csproj"
ToolPath="$(Stage0Directory)" ToolPath="$(PreviousStageDirectory)"
VersionSuffix="$(VersionSuffix)" VersionSuffix="$(VersionSuffix)"
Configuration="$(Configuration)" /> Configuration="$(Configuration)" />
</Target> </Target>
@ -34,7 +34,7 @@
<MakeDir Directories="$(PackagingBuildBasePath)" /> <MakeDir Directories="$(PackagingBuildBasePath)" />
<DotNetBuild ToolPath="$(Stage0Directory)" <DotNetBuild ToolPath="$(PreviousStageDirectory)"
Configuration="$(Configuration)" Configuration="$(Configuration)"
ProjectPath="%(ProjectsToPack.Identity)/%(ProjectsToPack.ProjectName).csproj" /> ProjectPath="%(ProjectsToPack.Identity)/%(ProjectsToPack.ProjectName).csproj" />
</Target> </Target>

4
build/prepare/CheckPrereqs.targets
View file

@ -8,8 +8,8 @@
DependsOnTargets="CheckUbuntuAptGetDependencies; DependsOnTargets="CheckUbuntuAptGetDependencies;
CheckCentOsYumDependencies;"> CheckCentOsYumDependencies;">
<Message Text="Using Stage0 version:" /> <Message Text="Using previous stage version:" />
<Exec Command="$(DotnetStage0) --version" /> <Exec Command="$(PreviousStageDotnet) --version" />
</Target> </Target>
<Target Name="CheckUbuntuAptGetDependencies" <Target Name="CheckUbuntuAptGetDependencies"

8
src/redist/redist.csproj
View file

@ -73,7 +73,7 @@
<Target Name="PublishRoslyn" <Target Name="PublishRoslyn"
BeforeTargets="Publish"> BeforeTargets="Publish">
<DotNetPublish ToolPath="$(Stage0Directory)" <DotNetPublish ToolPath="$(PreviousStageDirectory)"
Configuration="$(Configuration)" Configuration="$(Configuration)"
ProjectPath="$(SrcDirectory)/tool_roslyn/tool_roslyn.csproj" /> ProjectPath="$(SrcDirectory)/tool_roslyn/tool_roslyn.csproj" />
</Target> </Target>
@ -81,7 +81,7 @@
<Target Name="PublishFSharp" <Target Name="PublishFSharp"
BeforeTargets="Publish"> BeforeTargets="Publish">
<DotNetPublish ToolPath="$(Stage0Directory)" <DotNetPublish ToolPath="$(PreviousStageDirectory)"
Configuration="$(Configuration)" Configuration="$(Configuration)"
ProjectPath="$(SrcDirectory)/tool_fsharp/tool_fsc.csproj" /> ProjectPath="$(SrcDirectory)/tool_fsharp/tool_fsc.csproj" />
</Target> </Target>
@ -159,7 +159,7 @@
SdkLayoutDirectory=$(SdkOutputDirectory)/Sdks/%(BundledSdk.Identity); SdkLayoutDirectory=$(SdkOutputDirectory)/Sdks/%(BundledSdk.Identity);
DependencyPackageName=%(BundledSdk.Identity); DependencyPackageName=%(BundledSdk.Identity);
DependencyPackageVersion=%(BundledSdk.Version); DependencyPackageVersion=%(BundledSdk.Version);
Stage0Directory=$(Stage0Directory) PreviousStageDirectory=$(PreviousStageDirectory)
</Properties> </Properties>
</SdksToBundle> </SdksToBundle>
</ItemGroup> </ItemGroup>
@ -178,7 +178,7 @@
TemplateLayoutDirectory=$(SdkOutputDirectory)/Templates; TemplateLayoutDirectory=$(SdkOutputDirectory)/Templates;
TemplatePackageName=%(BundledTemplate.Identity); TemplatePackageName=%(BundledTemplate.Identity);
TemplatePackageVersion=%(BundledTemplate.Version); TemplatePackageVersion=%(BundledTemplate.Version);
Stage0Directory=$(Stage0Directory) PreviousStageDirectory=$(PreviousStageDirectory)
</Properties> </Properties>
</TemplatesToBundle> </TemplatesToBundle>
</ItemGroup> </ItemGroup>