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

Fixing Windows build script.

Browse source
This commit is contained in:
Livar Cunha 2017-10-13 11:52:47 -07:00
parent 62ae014c37
commit 03e37047a3
3 changed files with 13 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/ComposeSdk.targets
View file

@ -40,8 +40,9 @@
</Target> </Target>
<Target Name="CrossgenPublishDir" <Target Name="CrossgenPublishDir"
Condition=" '$(DISABLE_CROSSGEN)' == '' " Condition=" '$(DISABLE_CROSSGEN)' == '' ">
AfterTargets="PublishToolset"> <!-- Disabling crossgen until we have non-crossgened toolset -->
<!-- AfterTargets="PublishToolset"> -->
<ItemGroup> <ItemGroup>
<!-- Removing Full CLR built TestHost assemblies from getting Crossgen as it is throwing error --> <!-- Removing Full CLR built TestHost assemblies from getting Crossgen as it is throwing error -->
<SdkFiles Include="$(PublishDir)/**/*" Exclude="$(PublishDir)/TestHost*/**/*;$(PublishDir)/Sdks/**/*" /> <SdkFiles Include="$(PublishDir)/**/*" Exclude="$(PublishDir)/TestHost*/**/*;$(PublishDir)/Sdks/**/*" />

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

@ -119,7 +119,9 @@
Inputs="@(GenerateMSBuildExtensionsMsiInputs)" Inputs="@(GenerateMSBuildExtensionsMsiInputs)"
Outputs="$(MSBuildExtensionsInstallerFile)"> Outputs="$(MSBuildExtensionsInstallerFile)">
<Exec Command="powershell -NoProfile -NoLogo $(MSBuildExtensionsGenerateMsiPowershellScript) <!-- Disabling this for now because we don't have the MSBuildExtensions available. -->
<!-- <Exec Command="powershell -NoProfile -NoLogo $(MSBuildExtensionsGenerateMsiPowershellScript)
'$(MSBuildExtensionsOutputDirectory)' '$(MSBuildExtensionsOutputDirectory)'
'$(MSBuildExtensionsInstallerFile)' '$(MSBuildExtensionsInstallerFile)'
'$(WixRoot)' '$(WixRoot)'
@ -128,7 +130,7 @@
'$(SimpleVersion)' '$(SimpleVersion)'
'$(NugetVersion)' '$(NugetVersion)'
'$(MSBuildExtensionsInstallerUpgradeCode)' '$(MSBuildExtensionsInstallerUpgradeCode)'
'$(Architecture)'" /> '$(Architecture)'" /> -->
</Target> </Target>
<Target Name="GenerateSdkBundle" <Target Name="GenerateSdkBundle"
@ -180,35 +182,19 @@
$(SdkGenerateNupkgPowershellScript)" $(SdkGenerateNupkgPowershellScript)"
Outputs="$(SdkMSBuildExtensionsNupkgFile);$(SdkMSBuildExtensionsSwrFile)"> Outputs="$(SdkMSBuildExtensionsNupkgFile);$(SdkMSBuildExtensionsSwrFile)">
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript) <!-- Disabling this for now because we don't have the MSBuildExtensions available. -->
<!-- <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript)
'$(MSBuildExtensionsLayoutDirectory)' '$(MSBuildExtensionsLayoutDirectory)'
'$(FullNugetVersion)' '$(FullNugetVersion)'
'$(SdkMSBuildExtensionsNuspecFile)' '$(SdkMSBuildExtensionsNuspecFile)'
'$(SdkMSBuildExtensionsNupkgFile)'" /> '$(SdkMSBuildExtensionsNupkgFile)'" />
<GenerateMSBuildExtensionsSWR MSBuildExtensionsLayoutDirectory="$(MSBuildExtensionsLayoutDirectory)" <GenerateMSBuildExtensionsSWR MSBuildExtensionsLayoutDirectory="$(MSBuildExtensionsLayoutDirectory)"
OutputFile="$(SdkMSBuildExtensionsSwrFile)"/> OutputFile="$(SdkMSBuildExtensionsSwrFile)"/> -->
</Target> </Target>
<Target Name="TestSdkMsi"
Inputs="$(SdkInstallerFile)"
Outputs="$(SdkMsiTestedSentinel)"
DependsOnTargets="Init;MsiTargetsSetupInputOutputs;GenerateSdkMsi"
Condition=" '$(OS)' == 'Windows_NT'" >
<Exec Command ="powershell -NoProfile -NoLogo $(SdkTestMsiPowershellScript)
-InputMsi '$(SdkInstallerFile)'
-DotnetDir '$(PreviousStageDirectory)'
-TestDir '$(TestOutputDir)'" />
<WriteLinesToFile
File="$(SdkMsiTestedSentinel)"
Lines="$(SdkVersion)"
Overwrite="true"
Encoding="Unicode"/>
</Target>
<Target Name="GenerateMsis" <Target Name="GenerateMsis"
DependsOnTargets="Init; DependsOnTargets="Init;
Layout; Layout;
@ -218,8 +204,7 @@
GenerateMSBuildExtensionsMsi; GenerateMSBuildExtensionsMsi;
GenerateSdkBundle; GenerateSdkBundle;
GenerateSdkNupkg; GenerateSdkNupkg;
GenerateSdkMSBuildExtensionsNupkg; GenerateSdkMSBuildExtensionsNupkg"
TestSdkMsi"
Condition=" '$(OS)' == 'Windows_NT'" /> Condition=" '$(OS)' == 'Windows_NT'" />
<!-- These targets are used in signing, don't remove them! --> <!-- These targets are used in signing, don't remove them! -->

2
run-build.ps1
View file

@ -66,7 +66,7 @@ $env:VSTEST_BUILD_TRACE=1
$env:VSTEST_TRACE_BUILD=1 $env:VSTEST_TRACE_BUILD=1
# install a stage0 # install a stage0
$dotnetInstallPath = Join-Path $RepoRoot "bin\dotnet-install.ps1" $dotnetInstallPath = Join-Path $env:DOTNET_INSTALL_DIR "dotnet-install.ps1"
Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile "$dotnetInstallPath" Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile "$dotnetInstallPath"
Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""