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

Fix broken publish for official builds

Browse source
This commit is contained in:
Justin Goshi 2017-02-28 10:16:52 -08:00
parent c8e1a52b01
commit 9ffa76eab4
4 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
build/InstallerInfo.props
View file

@ -9,12 +9,4 @@
<LayoutDirectory Condition=" '$(OSName)' != 'ubuntu' ">$(IntermediateDirectory)/layouts</LayoutDirectory> <LayoutDirectory Condition=" '$(OSName)' != 'ubuntu' ">$(IntermediateDirectory)/layouts</LayoutDirectory>
<SdkLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdk)</SdkLayoutOutputDirectory> <SdkLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdk)</SdkLayoutOutputDirectory>
</PropertyGroup> </PropertyGroup>
<!-- Consumed By Publish -->
<ItemGroup>
<GeneratedInstallers Condition=" '$(OSName)' == 'ubuntu' "
Include="$(SdkInstallerFile)" />
<GeneratedInstallers Condition=" '$(OSName)' != 'ubuntu' "
Include="$(SdkInstallerFile);$(CombinedFrameworkSdkHostInstallerFile)" />
</ItemGroup>
</Project> </Project>

3
build/package/Installer.DEB.targets
View file

@ -99,6 +99,9 @@
<ItemGroup> <ItemGroup>
<TestSdkDebTaskEnvironmentVariables Include="PATH=$(DebianInstalledDirectory)$(PathListSeparator)$(PATH)" /> <TestSdkDebTaskEnvironmentVariables Include="PATH=$(DebianInstalledDirectory)$(PathListSeparator)$(PATH)" />
<!-- Consumed By Publish -->
<GeneratedInstallers Include="$(SdkInstallerFile)" />
</ItemGroup> </ItemGroup>
</Target> </Target>
</Project> </Project>

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

@ -34,6 +34,11 @@
$(SdkGenerateMsiPowershellScript)" /> $(SdkGenerateMsiPowershellScript)" />
</ItemGroup> </ItemGroup>
<!-- Consumed By Publish -->
<ItemGroup>
<GeneratedInstallers Include="$(SdkInstallerFile);$(CombinedFrameworkSdkHostInstallerFile)" />
</ItemGroup>
<GenerateMsiVersion CommitCount="$(CommitCount)" <GenerateMsiVersion CommitCount="$(CommitCount)"
VersionMajor="$(VersionMajor)" VersionMajor="$(VersionMajor)"
VersionMinor="$(VersionMinor)" VersionMinor="$(VersionMinor)"

5
build/package/Installer.PKG.targets
View file

@ -82,6 +82,11 @@
</DistributionTemplateReplacement> </DistributionTemplateReplacement>
</ItemGroup> </ItemGroup>
<!-- Consumed By Publish -->
<ItemGroup>
<GeneratedInstallers Include="$(SdkInstallerFile);$(CombinedFrameworkSdkHostInstallerFile)" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<GenerateSdkPkgInputs Include="$(SdkLayoutOutputDirectory)/**/*" /> <GenerateSdkPkgInputs Include="$(SdkLayoutOutputDirectory)/**/*" />
<GenerateSdkPkgInputs Include="$(SdkPkgScriptsDirectory)/**/*" /> <GenerateSdkPkgInputs Include="$(SdkPkgScriptsDirectory)/**/*" />