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

Everything working

Browse source
This commit is contained in:
Bryan Thornbury 2016-07-01 07:04:40 -07:00
parent 5cfecec2e9
commit a0c1b7a0c0
5 changed files with 42 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/Microsoft.DotNet.Cli.Prepare.targets
View file

@ -29,7 +29,7 @@
<DotNetPath>$(Stage0Path)</DotNetPath> <DotNetPath>$(Stage0Path)</DotNetPath>
<BaseOutputDirectory>$(RepoRoot)/artifacts/$(Rid)</BaseOutputDirectory> <BaseOutputDirectory>$(RepoRoot)/artifacts/$(Rid)</BaseOutputDirectory>
<OutputDirectory>$(BaseOutputDirectory)/stage2</OutputDirectory> <OutputDirectory>$(BaseOutputDirectory)/stage2/</OutputDirectory>
<Stage2CompilationDirectory>$(BaseOutputDirectory)/stage2compilation</Stage2CompilationDirectory> <Stage2CompilationDirectory>$(BaseOutputDirectory)/stage2compilation</Stage2CompilationDirectory>
<IntermediateDirectory>$(BaseOutputDirectory)/intermediate</IntermediateDirectory> <IntermediateDirectory>$(BaseOutputDirectory)/intermediate</IntermediateDirectory>
<PackagesDirectory>$(BaseOutputDirectory)/packages</PackagesDirectory> <PackagesDirectory>$(BaseOutputDirectory)/packages</PackagesDirectory>

15
build/package/Microsoft.DotNet.Cli.Archive.targets
View file

@ -10,18 +10,25 @@
<ItemGroup> <ItemGroup>
<GeneratedArchives Include="$(ArchiveOutputDirectory)/%(LayoutDefinition.NameWithVersion)$(ArchiveExtension)" /> <GeneratedArchives Include="$(ArchiveOutputDirectory)/%(LayoutDefinition.NameWithVersion)$(ArchiveExtension)" />
<GenerateArchivesInputsOutputs Include="%(LayoutDefinition.Name)">
<Inputs>%(LayoutDefinition.OutputFiles)</Inputs>
<Outputs>$(ArchiveOutputDirectory)/%(LayoutDefinition.NameWithVersion)$(ArchiveExtension)</Outputs>
<InputDirectory>$(LayoutDirectory)/%(LayoutDefinition.Name)</InputDirectory>
<OutFileName>%(LayoutDefinition.NameWithVersion)</OutFileName>
</GenerateArchivesInputsOutputs>
</ItemGroup> </ItemGroup>
</Target> </Target>
<Target Name="GenerateArchives" <Target Name="GenerateArchives"
DependsOnTargets="Init;Layout;SetupGenerateArchivesInputsOutputs" DependsOnTargets="Init;Layout;SetupGenerateArchivesInputsOutputs"
Inputs="@(LayoutDefinition -> '$(LayoutDirectory)/%(Name)')" Inputs="%(GenerateArchivesInputsOutputs.Inputs)"
Outputs="@(GeneratedArchives -> '%(Identity)')"> Outputs="%(GenerateArchivesInputsOutputs.Outputs)">
<ArchiveDirectory <ArchiveDirectory
FileName="%(LayoutDefinition.NameWithVersion)" FileName="%(GenerateArchivesInputsOutputs.OutFileName)"
OutputDirectory="$(ArchiveOutputDirectory)" OutputDirectory="$(ArchiveOutputDirectory)"
InputDirectory="$(LayoutDirectory)/%(LayoutDefinition.Name)" > InputDirectory="$(LayoutDirectory)/%(GenerateArchivesInputsOutputs.InputDirectory)" >
<Output TaskParameter="OutputArchive" <Output TaskParameter="OutputArchive"
ItemName="Archives" /> ItemName="Archives" />

14
build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
View file

@ -1,16 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<UsingTask TaskName="DebTargets" AssemblyFile="$(CLIBuildDll)" /> <UsingTask TaskName="DebTargets" AssemblyFile="$(CLIBuildDll)" />
<Target Name="GenerateSdkDeb" > <Target Name="GenerateDebs" >
<DebTargets />
</Target> </Target>
<Target Name="GenerateDebs"
DependsOnTargets="Init;
Layout;
GenerateSdkDeb;
TestSdkDeb" />
</Project> </Project>

33
build/package/Microsoft.DotNet.Cli.Installer.PKG.targets
View file

@ -66,13 +66,25 @@
<ItemGroup> <ItemGroup>
<GeneratedInstallers Include="$(SdkInstallerFile);$(CombinedFrameworkSdkHostInstallerFile)" /> <GeneratedInstallers Include="$(SdkInstallerFile);$(CombinedFrameworkSdkHostInstallerFile)" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<GenerateSdkPkgInputs Include="$(SdkLayoutOutputDirectory)/**/*" />
<GenerateSdkPkgInputs Include="$(SdkPkgScriptsDirectory)/**/*" />
<GenerateSdkProductArchiveInputs Include="$(SdkInstallerFile)" />
<GenerateSdkProductArchiveInputs Include="$(DownloadedSharedFrameworkInstallerFile)" />
<GenerateSdkProductArchiveInputs Include="$(DownloadedHostFxrInstallerFile)" />
<GenerateSdkProductArchiveInputs Include="$(DownloadedSharedHostInstallerFile)" />
<GenerateSdkProductArchiveInputs Include="$(SdkProductArchiveDistributionTemplateFile)" />
<GenerateSdkProductArchiveInputs Include="$(SdkProductArchiveResourcesDirectory)/**/*" />
</ItemGroup>
</Target> </Target>
<Target Name="GenerateSdkPkg" <Target Name="GenerateSdkPkg"
Inputs="$(SdkLayoutOutputDirectory);" Inputs="@(GenerateSdkPkgInputs)"
Outputs="$(SdkInstallerFile)" Outputs="$(SdkInstallerFile)"
DependsOnTargets="Init;Layout;SetupPkgInputsOutputs" DependsOnTargets="Init;Layout;SetupPkgInputsOutputs"
Condition=" '%(OSName)' == 'osx' "> Condition=" '$(OSName)' == 'osx' ">
<Exec Command="pkgbuild <Exec Command="pkgbuild
--root '$(SdkLayoutOutputDirectory)' --root '$(SdkLayoutOutputDirectory)'
@ -84,16 +96,10 @@
</Target> </Target>
<Target Name="GenerateSdkProductArchive" <Target Name="GenerateSdkProductArchive"
Inputs="$(SdkInstallerFile); Inputs="@(GenerateSdkProductArchiveInputs)"
$(DownloadedSharedFrameworkInstallerFile);
$(DownloadedHostFxrInstallerFile);
$(DownloadedSharedHostInstallerFile);
$(SdkProductArchiveDistributionTemplateFile);
$(ResourcesPath)"
Outputs="$(CombinedFrameworkSdkHostInstallerFile)" Outputs="$(CombinedFrameworkSdkHostInstallerFile)"
DependsOnTargets="GenerateSdkPkg" DependsOnTargets="GenerateSdkPkg"
Condition=" '%(OSName)' == 'osx' "> Condition=" '$(OSName)' == 'osx' ">
<!-- Move ProductArchive pkg components into place with component ids in the filenames --> <!-- Move ProductArchive pkg components into place with component ids in the filenames -->
<Copy <Copy
SourceFiles="$(SdkInstallerFile); SourceFiles="$(SdkInstallerFile);
@ -103,8 +109,7 @@
DestinationFiles="$(SdkPkgIntermediatePath); DestinationFiles="$(SdkPkgIntermediatePath);
$(SharedFrameworkPkgIntermediatePath); $(SharedFrameworkPkgIntermediatePath);
$(HostFxrPkgIntermediatePath); $(HostFxrPkgIntermediatePath);
$(SharedHostPkgIntermediatePath);" $(SharedHostPkgIntermediatePath);" />
Overwrite="true" />
<!-- Fill out parameters in the Distribution Template --> <!-- Fill out parameters in the Distribution Template -->
<ReplaceFileContents <ReplaceFileContents
@ -117,7 +122,7 @@
--version '$(SdkVersion)' --version '$(SdkVersion)'
--identifier '$(SdkProductArchiveId)' --identifier '$(SdkProductArchiveId)'
--package-path '$(PkgIntermediateDirectory)' --package-path '$(PkgIntermediateDirectory)'
--resources '$(ResourcesPath)' --resources '$(SdkProductArchiveResourcesDirectory)'
--distribution '$(SdkProductArchiveDistributionFile)' --distribution '$(SdkProductArchiveDistributionFile)'
'$(CombinedFrameworkSdkHostInstallerFile)'" /> '$(CombinedFrameworkSdkHostInstallerFile)'" />
</Target> </Target>
@ -128,6 +133,6 @@
SetupPkgInputsOutputs; SetupPkgInputsOutputs;
GenerateSdkPkg; GenerateSdkPkg;
GenerateSdkProductArchive" GenerateSdkProductArchive"
Condition=" '%(OSName)' == 'osx' " /> Condition=" '$(OSName)' == 'osx' " />
</Project> </Project>

12
build/package/Microsoft.DotNet.Cli.Layout.targets
View file

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<UsingTask TaskName="MakeRelative" AssemblyFile="$(CLIBuildDll)" />
<Target DependsOnTargets="Init" Name="SetupLayoutInputsOutputs" > <Target DependsOnTargets="Init" Name="SetupLayoutInputsOutputs" >
<PropertyGroup> <PropertyGroup>
@ -9,8 +11,8 @@
<!-- Set up Items with Layout Input Files --> <!-- Set up Items with Layout Input Files -->
<ItemGroup> <ItemGroup>
<SdkLayoutInput Include="$(OutputDirectory)/sdk/**/*" /> <SdkLayoutInput Include="$(OutputDirectory)/sdk/**/*" />
<SdkDebugLayoutInput Include="$(SymbolsOutputDirectory)/sdk/**/*.pdb" /> <SdkDebugLayoutInput Include="$(SymbolsOutputDirectory)/sdk/**/*" />
<CombinedHostHostFxrFrameworkSdkInput Include="$(OutputDirectory)/**" /> <CombinedHostHostFxrFrameworkSdkInput Include="$(OutputDirectory)/**/*" />
<CombinedFrameworkSdkInput Include="$(OutputDirectory)/shared/**/*" /> <CombinedFrameworkSdkInput Include="$(OutputDirectory)/shared/**/*" />
<CombinedFrameworkSdkInput Include="$(OutputDirectory)/sdk/**/*" /> <CombinedFrameworkSdkInput Include="$(OutputDirectory)/sdk/**/*" />
</ItemGroup> </ItemGroup>
@ -45,14 +47,14 @@
<!-- Set up Items Defining Layouts for easy change --> <!-- Set up Items Defining Layouts for easy change -->
<ItemGroup> <ItemGroup>
<LayoutDefinition Include="SdkName"> <LayoutDefinition Include="Sdk">
<InputFiles>@(SdkLayoutInput)</InputFiles> <InputFiles>@(SdkLayoutInput)</InputFiles>
<OutputFiles>@(SdkRelativeOutputFiles -> '$(SdkLayoutOutputDirectory)/%(Identity)')</OutputFiles> <OutputFiles>@(SdkRelativeOutputFiles -> '$(SdkLayoutOutputDirectory)/%(Identity)')</OutputFiles>
<NameWithVersion>$(ArtifactNameWithVersionSdk)</NameWithVersion> <NameWithVersion>$(ArtifactNameWithVersionSdk)</NameWithVersion>
<Name>$(ArtifactNameSdk)</Name> <Name>$(ArtifactNameSdk)</Name>
</LayoutDefinition> </LayoutDefinition>
<LayoutDefinition Include="SdkDebug"> <LayoutDefinition Include="Debug">
<InputFiles>@(SdkDebugLayoutInput)</InputFiles> <InputFiles>@(SdkDebugLayoutInput)</InputFiles>
<OutputFiles>@(SdkDebugRelativeOutputFiles -> '$(SdkDebugLayoutOutputDirectory)/%(Identity)')</OutputFiles> <OutputFiles>@(SdkDebugRelativeOutputFiles -> '$(SdkDebugLayoutOutputDirectory)/%(Identity)')</OutputFiles>
<NameWithVersion>$(ArtifactNameWithVersionSdkDebug)</NameWithVersion> <NameWithVersion>$(ArtifactNameWithVersionSdkDebug)</NameWithVersion>
@ -77,7 +79,7 @@
</Target> </Target>
<Target Name="Layout" <Target Name="Layout"
DependsOnTargets="Init;dotn" DependsOnTargets="Init;SetupLayoutInputsOutputs"
Inputs="@(LayoutDefinition -> '%(InputFiles)')" Inputs="@(LayoutDefinition -> '%(InputFiles)')"
Outputs="@(LayoutDefinition -> '%(OutputFiles)')" > Outputs="@(LayoutDefinition -> '%(OutputFiles)')" >