Skip to content

Commit 8bc686c

Browse files
joeloffjoeloff
committed
Update to latest Arcade, add CreateWixBuildWixpack
1 parent d908c78 commit 8bc686c

File tree

6 files changed

+57
-35
lines changed

6 files changed

+57
-35
lines changed

‎NuGet.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<!-- Begin: Package sources from dotnet-aspire -->
77
<!-- End: Package sources from dotnet-aspire -->
88
<!-- Begin: Package sources from dotnet-runtime -->
9-
<add key="darc-int-dotnet-runtime-3875b54" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3875b54e/nuget/v3/index.json" />
109
<!-- End: Package sources from dotnet-runtime -->
1110
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1211
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -38,7 +37,6 @@
3837
<clear />
3938
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4039
<!-- Begin: Package sources from dotnet-runtime -->
41-
<add key="darc-int-dotnet-runtime-3875b54" value="true" />
4240
<!-- End: Package sources from dotnet-runtime -->
4341
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4442
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -517,37 +517,37 @@
517517
</Dependency>
518518
</ProductDependencies>
519519
<ToolsetDependencies>
520-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25359.101">
521-
<Uri>https://github.com/dotnet/dotnet</Uri>
522-
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
520+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25367.3">
521+
<Uri>https://github.com/dotnet/arcade</Uri>
522+
<Sha>6445f37f3e88b2fda5b7315d3c67366fe1cdfb51</Sha>
523523
</Dependency>
524-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25359.101">
525-
<Uri>https://github.com/dotnet/dotnet</Uri>
526-
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
524+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25367.3">
525+
<Uri>https://github.com/dotnet/arcade</Uri>
526+
<Sha>6445f37f3e88b2fda5b7315d3c67366fe1cdfb51</Sha>
527527
</Dependency>
528-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25359.101">
529-
<Uri>https://github.com/dotnet/dotnet</Uri>
530-
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
528+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25367.3">
529+
<Uri>https://github.com/dotnet/arcade</Uri>
530+
<Sha>6445f37f3e88b2fda5b7315d3c67366fe1cdfb51</Sha>
531531
</Dependency>
532-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25359.101">
533-
<Uri>https://github.com/dotnet/dotnet</Uri>
534-
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
532+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25367.3">
533+
<Uri>https://github.com/dotnet/arcade</Uri>
534+
<Sha>6445f37f3e88b2fda5b7315d3c67366fe1cdfb51</Sha>
535535
</Dependency>
536-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25359.101">
537-
<Uri>https://github.com/dotnet/dotnet</Uri>
538-
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
536+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25367.3">
537+
<Uri>https://github.com/dotnet/arcade</Uri>
538+
<Sha>6445f37f3e88b2fda5b7315d3c67366fe1cdfb51</Sha>
539539
</Dependency>
540-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25359.101">
541-
<Uri>https://github.com/dotnet/dotnet</Uri>
542-
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
540+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25367.3">
541+
<Uri>https://github.com/dotnet/arcade</Uri>
542+
<Sha>6445f37f3e88b2fda5b7315d3c67366fe1cdfb51</Sha>
543543
</Dependency>
544-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25359.101">
545-
<Uri>https://github.com/dotnet/dotnet</Uri>
546-
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
544+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25367.3">
545+
<Uri>https://github.com/dotnet/arcade</Uri>
546+
<Sha>6445f37f3e88b2fda5b7315d3c67366fe1cdfb51</Sha>
547547
</Dependency>
548-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25359.101">
549-
<Uri>https://github.com/dotnet/dotnet</Uri>
550-
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
548+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25367.3">
549+
<Uri>https://github.com/dotnet/arcade</Uri>
550+
<Sha>6445f37f3e88b2fda5b7315d3c67366fe1cdfb51</Sha>
551551
</Dependency>
552552
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.7.25359.101">
553553
<Uri>https://github.com/dotnet/dotnet</Uri>

‎eng/Versions.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -282,12 +282,12 @@
282282
</PropertyGroup>
283283
<PropertyGroup>
284284
<!-- Dependencies from https://github.com/dotnet/arcade -->
285-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25359.101</MicrosoftDotNetBuildTasksInstallersPackageVersion>
286-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25359.101</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
287-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25359.101</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
288-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25359.101</MicrosoftDotNetSignToolVersion>
289-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25359.101</MicrosoftDotNetXliffTasksVersion>
290-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25359.101</MicrosoftDotNetXUnitExtensionsVersion>
285+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25367.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
286+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25367.3</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
287+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25367.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
288+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25367.3</MicrosoftDotNetSignToolVersion>
289+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25367.3</MicrosoftDotNetXliffTasksVersion>
290+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25367.3</MicrosoftDotNetXUnitExtensionsVersion>
291291
</PropertyGroup>
292292
<PropertyGroup>
293293
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
414414

415415
# Locate Visual Studio installation or download x-copy msbuild.
416416
$vsInfo = LocateVisualStudio $vsRequirements
417-
if ($vsInfo -ne $null) {
417+
if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) {
418418
# Ensure vsInstallDir has a trailing slash
419419
$vsInstallDir = Join-Path $vsInfo.installationPath "\"
420420
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
}
2222
},
2323
"msbuild-sdks": {
24-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25359.101",
25-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25359.101",
24+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25367.3",
25+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25367.3",
2626
"Microsoft.Build.NoTargets": "3.7.0",
2727
"Microsoft.Build.Traversal": "3.4.0",
2828
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"

‎src/Layout/pkg/windows/Directory.Build.targets

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,28 @@
4646
<Error Condition="'$(OutputType)' == 'Bundle' AND '$(InstallerPlatform)' != 'x86'"
4747
Text="Bundles must target x86. InstallerPlatform=$(InstallerPlatform)" />
4848
</Target>
49+
50+
<Target Name="GenerateWixpackPackage" AfterTargets="CoreCompile">
51+
<PropertyGroup>
52+
<WixpackWorkingDir>$(IntermediateOutputPath)wixpack</WixpackWorkingDir>
53+
<WixpackOutputDir>$(ArtifactsNonShippingPackagesDir)</WixpackOutputDir>
54+
</PropertyGroup>
55+
56+
<CreateWixBuildWixpack
57+
BindTrackingFile="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.OutputSuffix)$(BindTrackingFileExtension)"
58+
Cultures="%(CultureGroup.Identity)"
59+
DefineConstants="$(DefineConstants);$(SolutionDefineConstants);$(ProjectDefineConstants);$(ProjectReferenceDefineConstants)"
60+
Extensions="@(_ResolvedWixExtensionPaths)"
61+
InstallerPlatform="$(InstallerPlatform)"
62+
InstallerFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)"
63+
IntermediateDirectory="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)"
64+
OutputFolder="$(WixpackOutputDir)"
65+
OutputType="$(OutputType)"
66+
PdbFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)"
67+
PdbType="$(DebugType)"
68+
SourceFiles="@(Compile)"
69+
WixpackWorkingDir="$(WixpackWorkingDir)">
70+
<Output TaskParameter="OutputFile" PropertyName="_WixBuildCommandPackageNameOutput" />
71+
</CreateWixBuildWixpack>
72+
</Target>
4973
</Project>

0 commit comments

Comments
 (0)