Skip to content

Make xcopy-deployable on Windows #138

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Make xcopy-deployable on Windows #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c0cafb
Enable single-file for win-x86
vatsan-madhavan Apr 3, 2020
90ae220
Enable shipping dotnet-core-uninstall on Windows as a single-exe zip …
vatsan-madhavan Apr 3, 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
9 changes: 9 additions & 0 deletions .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,21 @@ jobs:
/p:RID=$(_RID)
displayName: Build and Publish
- task: CopyFiles@2
displayName: Copy MSI to Staging Directory
condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
inputs:
sourceFolder: 'artifacts/packages/$(_BuildConfig)/Shipping/'
contents: '*.msi'
targetFolder: '$(Build.ArtifactStagingDirectory)'
- task: CopyFiles@2
displayName: Copy ZIP to Staging Directory
condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
inputs:
sourceFolder: 'artifacts/packages/$(_BuildConfig)/Shipping/'
contents: '*.zip'
targetFolder: '$(Build.ArtifactStagingDirectory)'
- task: PublishBuildArtifacts@1
displayName: Publish Build Artifacts
condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
inputs:
pathtoPublish: '$(Build.ArtifactStagingDirectory)'
Expand Down
8 changes: 7 additions & 1 deletion src/redist/targets/GenerateLayout.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<DotnetCoreUninstallOutputDirectory>$(ArtifactsDir)layout\dotnet-core-uninstall\</DotnetCoreUninstallOutputDirectory>
<DownloadsFolder>$(IntermediateOutputPath)downloads\</DownloadsFolder>
<_PublishSingleFileForRid>true</_PublishSingleFileForRid>
<_PublishSingleFileForRid Condition="'$(RID)' == 'win-x86'">false</_PublishSingleFileForRid>
<_GenerateLayoutDependsOnTargets>CleanLayoutPath;PublishDotnetCoreUninstallProject</_GenerateLayoutDependsOnTargets>
<_GenerateLayoutDependsOnTargets Condition="'$(RID)' == 'win-x86'">CleanLayoutPath;PublishDotnetCoreUninstallProject;SignLayout</_GenerateLayoutDependsOnTargets>
</PropertyGroup>
Expand All @@ -26,5 +25,12 @@
Properties="PublishDir=$(DotnetCoreUninstallOutputDirectory);PublishSingleFile=$(_PublishSingleFileForRid);RuntimeIdentifier=$(RID);PublishTrimmed=true;SelfContained=true"
Targets="Publish">
</MSBuild>

<MakeDir Directories="$(ArtifactsShippingPackagesDir)"
Condition="'$(RID)' == 'win-x86'" />
<ZipDirectory SourceDirectory="$(DotnetCoreUninstallOutputDirectory)"
DestinationFile="$(ArtifactsShippingPackagesDir)dotnet-core-uninstall.zip"
Condition="'$(RID)' == 'win-x86'"
Overwrite="true" />
</Target>
</Project>
8 changes: 7 additions & 1 deletion src/redist/targets/Signing.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<ExternalCertificateId Condition="'$(ExternalCertificateId)' == ''">3PartySHA2</ExternalCertificateId>
<InternalCertificateId Condition="'$(InternalCertificateId)' == ''">Microsoft400</InternalCertificateId>
<NugetCertificateId Condition="'$(NugetCertificateId)' == ''">NuGet</NugetCertificateId>
<ZipCertificateId Condition="'$(ZipCertificateId)' == ''">None</ZipCertificateId>
</PropertyGroup>


Expand Down Expand Up @@ -76,7 +77,7 @@
</Target>

<Target Name="SignLayout" Condition="'$(SignCoreDotnetCoreUninstall)' == 'true'" DependsOnTargets="SetSignProps">

<ItemGroup>
<!-- External files -->
<LayoutFilesToSign Include="$(DotnetCoreUninstallOutputDirectory)**/Newtonsoft.Json.dll">
Expand All @@ -88,6 +89,11 @@
<CertificateName>$(InternalCertificateId)</CertificateName>
</LayoutFilesToSign>

<!-- Zip file in Packages directory -->
<LayoutFilesToSign Include="$(ArtifactsShippingPackagesDir)dotnet-core-uninstall.zip"
Condition="'$(RID)' == 'win-x86'">
<CertificateName>$(ZipCertificateId)</CertificateName>
</LayoutFilesToSign>

<LayoutFileSignInfo Include="@(LayoutFilesToSign->'%(Filename)%(Extension)')">
<CertificateName>%(CertificateName)</CertificateName>
Expand Down