Skip to content

Add light/lit command packages #25334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 31, 2020
Merged

Add light/lit command packages #25334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a98d01c
Add light/lit command packages
mmitche Aug 27, 2020
1312578
Merge branch 'release/5.0' into light-command-packages
mmitche Aug 28, 2020
11f28e9
Merge branch 'release/5.0' into light-command-packages
mmitche Aug 28, 2020
63bea08
Update Versions.props
mmitche Aug 28, 2020
13f5eae
Merge branch 'release/5.0' into light-command-packages
mmitche Aug 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,10 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20427.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20427.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
Expand Down
3 changes: 3 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-rc.1.20431.2</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>5.0.0-rc.1.20431.2</MicrosoftEntityFrameworkCorePackageVersion>
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.0-rc.1.20431.2</MicrosoftEntityFrameworkCoreDesignPackageVersion>

<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20427.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<!--

Expand Down
19 changes: 19 additions & 0 deletions src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,23 @@
<PropertyGroup>
<PackageFileName>$(InternalInstallerBaseName)-$(PackageVersion)-win-$(Platform)$(TargetExt)</PackageFileName>
</PropertyGroup>

<!-- Overwrite the wix package drop creation target to create a lit
package instead. -->
<Target Name="CreateWixPackageDrop" AfterTargets="Build">
<CreateLitCommandPackageDrop
LitCommandWorkingDir="$(WixCommandObjDir)"
WixExtensions="@(WixExtension)"
Bf="true"
Out="$(InstallersOutputPath)$(OutputName).wixlib"
WixSrcFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(WixLibrary)">
<Output TaskParameter="LitCommandPackageNameOutput" PropertyName="_LitCommandPackageNameOutput" />
</CreateLitCommandPackageDrop>
<MakeDir Directories="$(WixCommandPackagesDir)" />

<ZipDirectory
DestinationFile="$(WixCommandPackagesDir)/LitCommandPackage-$(_LitCommandPackageNameOutput).zip"
SourceDirectory="$(WixCommandObjDir)/$(_LitCommandPackageNameOutput)"
Overwrite="true" />
</Target>
</Project>
8 changes: 8 additions & 0 deletions src/Installers/Windows/Wix.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,12 @@
<GenerateNupkgPowershellScript>$(RepoRoot)\src\Installers\Windows\GenerateNugetPackageWithMsi.ps1</GenerateNupkgPowershellScript>
</PropertyGroup>

<!-- Properties for light/lit command package drop generation -->
<PropertyGroup>
<!-- Directory for the unzipped directory -->
<WixCommandObjDir>$(ArtifactsObjDir)/WixCommandPackages</WixCommandObjDir>
<!-- Directory for the zipped up light/lit command package -->
<WixCommandPackagesDir>$(ArtifactsNonShippingPackagesDir)</WixCommandPackagesDir>
</PropertyGroup>

</Project>
35 changes: 35 additions & 0 deletions src/Installers/Windows/Wix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,18 @@
<GuidInputs>$(Version);$(Platform);$(VersionSuffix);$(_BuildNumberLabels)</GuidInputs>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersPackageVersion)" />
</ItemGroup>

<PropertyGroup>
<MicrosoftDotNetBuildTasksInstallersTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\netcoreapp2.0\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>
<MicrosoftDotNetBuildTasksInstallersTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\net472\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>
</PropertyGroup>

<UsingTask TaskName="CreateLightCommandPackageDrop" AssemblyFile="$(MicrosoftDotNetBuildTasksInstallersTaskAssembly)" />
<UsingTask TaskName="CreateLitCommandPackageDrop" AssemblyFile="$(MicrosoftDotNetBuildTasksInstallersTaskAssembly)" />

<Target Name="GenerateGUIDs" BeforeTargets="BeforeBuild" DependsOnTargets="_GeneratePackageGuids;_GenerateBundleGuids" Condition=" '$(DisableGuidGeneration)' != 'true' " />

<Target Name="_GeneratePackageGuids" Condition="'$(OutputType)' == 'package'">
Expand Down Expand Up @@ -72,4 +84,27 @@
<Copy SourceFiles="@(_cabs)" DestinationFolder="$(InstallersOutputPath)" />
</Target>

<Target Name="CreateWixPackageDrop" AfterTargets="Build">
<CreateLightCommandPackageDrop
LightCommandWorkingDir="$(WixCommandObjDir)"
NoLogo="true"
Cultures="en-us"
Out="$(InstallersOutputPath)$(PackageFileName)"
AdditionalBasePaths="$(MSBuildProjectDirectory)"
WixExtensions="@(WixExtension)"
Loc="@(EmbeddedResource)"
Sice="$(SuppressIces)"
WixProjectFile="$(MSBuildProjectFile)"
Fv="true"
WixSrcFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(_ResolvedWixLibraryPaths)">
<Output TaskParameter="LightCommandPackageNameOutput" PropertyName="_LightCommandPackageNameOutput" />
</CreateLightCommandPackageDrop>
<MakeDir Directories="$(WixCommandPackagesDir)" />

<ZipDirectory
DestinationFile="$(WixCommandPackagesDir)/LightCommandPackage-$(_LightCommandPackageNameOutput).zip"
SourceDirectory="$(WixCommandObjDir)/$(_LightCommandPackageNameOutput)"
Overwrite="true" />
</Target>

</Project>