Skip to content

Commit c678bf1

Browse files
ViktorHoferakoeplinger
ViktorHofer
and
akoeplinger
authored
Create dependencies for aspnetcore template packages (#46530)
Co-authored-by: Alexander Köplinger <[email protected]>
1 parent 336570c commit c678bf1

File tree

5 files changed

+97
-39
lines changed

5 files changed

+97
-39
lines changed

‎eng/Version.Details.xml‎

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -167,14 +167,6 @@
167167
<Uri>https://github.com/dotnet/roslyn</Uri>
168168
<Sha>6908aead3a8b313798c381d5e435e9e6068301a7</Sha>
169169
</Dependency>
170-
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.25073.4">
171-
<Uri>https://github.com/dotnet/aspnetcore</Uri>
172-
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
173-
</Dependency>
174-
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="10.0.0-alpha.2.25073.4">
175-
<Uri>https://github.com/dotnet/aspnetcore</Uri>
176-
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
177-
</Dependency>
178170
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.14.0-preview.1.11">
179171
<Uri>https://github.com/nuget/nuget.client</Uri>
180172
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
@@ -392,6 +384,42 @@
392384
<Uri>https://github.com/dotnet/aspnetcore</Uri>
393385
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
394386
</Dependency>
387+
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-alpha.2.25073.4">
388+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
389+
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
390+
</Dependency>
391+
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="10.0.0-alpha.2.25073.4">
392+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
393+
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
394+
</Dependency>
395+
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="10.0.0-alpha.2.25073.4">
396+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
397+
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
398+
</Dependency>
399+
<Dependency Name="Microsoft.JSInterop" Version="10.0.0-alpha.2.25073.4">
400+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
401+
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
402+
</Dependency>
403+
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="10.0.0-alpha.2.25073.4">
404+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
405+
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
406+
</Dependency>
407+
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.25073.4">
408+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
409+
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
410+
</Dependency>
411+
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="10.0.0-alpha.2.25073.4">
412+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
413+
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
414+
</Dependency>
415+
<Dependency Name="Microsoft.DotNet.Web.ItemTemplates.10.0" Version="10.0.0-alpha.2.25073.4">
416+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
417+
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
418+
</Dependency>
419+
<Dependency Name="Microsoft.DotNet.Web.ProjectTemplates.10.0" Version="10.0.0-alpha.2.25073.4">
420+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
421+
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
422+
</Dependency>
395423
<!-- Intermediate is necessary for source build. -->
396424
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="10.0.0-alpha.2.25073.4">
397425
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -416,22 +444,6 @@
416444
<Sha>b16f63a0c4e003acad74eb3f17d648c6ec17622b</Sha>
417445
<SourceBuild RepoName="razor" ManagedOnly="true" />
418446
</Dependency>
419-
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-alpha.2.25073.4">
420-
<Uri>https://github.com/dotnet/aspnetcore</Uri>
421-
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
422-
</Dependency>
423-
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="10.0.0-alpha.2.25073.4">
424-
<Uri>https://github.com/dotnet/aspnetcore</Uri>
425-
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
426-
</Dependency>
427-
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="10.0.0-alpha.2.25073.4">
428-
<Uri>https://github.com/dotnet/aspnetcore</Uri>
429-
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
430-
</Dependency>
431-
<Dependency Name="Microsoft.JSInterop" Version="10.0.0-alpha.2.25073.4">
432-
<Uri>https://github.com/dotnet/aspnetcore</Uri>
433-
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
434-
</Dependency>
435447
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
436448
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.2.25102.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
437449
<Uri>https://github.com/dotnet/winforms</Uri>
@@ -582,10 +594,6 @@
582594
<Uri>https://github.com/dotnet/runtime</Uri>
583595
<Sha>37b1764e19aceaa545d8433c490b850538b8905a</Sha>
584596
</Dependency>
585-
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="10.0.0-alpha.2.25073.4">
586-
<Uri>https://github.com/dotnet/aspnetcore</Uri>
587-
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
588-
</Dependency>
589597
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.2.25104.7">
590598
<Uri>https://github.com/dotnet/runtime</Uri>
591599
<Sha>37b1764e19aceaa545d8433c490b850538b8905a</Sha>

‎eng/Versions.props‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
</PropertyGroup>
8484
<PropertyGroup>
8585
<!-- Dependency from https://github.com/dotnet/winforms -->
86-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-preview.2.25102.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
86+
<MicrosoftDotNetWinFormsProjectTemplatesPackageVersion>10.0.0-preview.2.25102.1</MicrosoftDotNetWinFormsProjectTemplatesPackageVersion>
8787
</PropertyGroup>
8888
<PropertyGroup>
8989
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -237,6 +237,8 @@
237237
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.25073.4</MicrosoftAspNetCoreTestHostPackageVersion>
238238
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.25073.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
239239
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.25073.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
240+
<MicrosoftDotNetWebItemTemplates100PackageVersion>10.0.0-alpha.2.25073.4</MicrosoftDotNetWebItemTemplates100PackageVersion>
241+
<MicrosoftDotNetWebProjectTemplates100PackageVersion>10.0.0-alpha.2.25073.4</MicrosoftDotNetWebProjectTemplates100PackageVersion>
240242
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.25073.4</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
241243
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.25073.4</dotnetdevcertsPackageVersion>
242244
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.25073.4</dotnetuserjwtsPackageVersion>
@@ -253,12 +255,6 @@
253255
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-preview.2.25103.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
254256
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-preview.2.25103.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
255257
</PropertyGroup>
256-
<PropertyGroup Label="Template versions">
257-
<!-- 10.0 Template versions -->
258-
<AspNetCorePackageVersionFor100Templates>$(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)</AspNetCorePackageVersionFor100Templates>
259-
<MicrosoftDotnetWinFormsProjectTemplates100PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates100PackageVersion>
260-
<MicrosoftDotNetWpfProjectTemplates100PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates100PackageVersion>
261-
</PropertyGroup>
262258
<PropertyGroup Label="Infrastructure and test only dependencies">
263259
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
264260
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>10.0.0-preview.24602.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>

‎src/Installer/redist-installer/targets/BundledTemplates.targets‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
</Target>
2121

2222
<ItemGroup Label=".NET 10.0 templates">
23-
<Bundled100Templates Include="Microsoft.DotNet.Web.ItemTemplates.10.0" PackageVersion="$(AspNetCorePackageVersionFor100Templates)" />
24-
<Bundled100Templates Include="Microsoft.DotNet.Web.ProjectTemplates.10.0" PackageVersion="$(AspNetCorePackageVersionFor100Templates)" UseVersionForTemplateInstallPath="true" />
25-
<Bundled100Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWinFormsProjectTemplates100PackageVersion)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
26-
<Bundled100Templates Include="Microsoft.Dotnet.Wpf.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWpfProjectTemplates100PackageVersion)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
23+
<Bundled100Templates Include="Microsoft.DotNet.Web.ItemTemplates.10.0" PackageVersion="$(MicrosoftDotNetWebItemTemplates100PackageVersion)" />
24+
<Bundled100Templates Include="Microsoft.DotNet.Web.ProjectTemplates.10.0" PackageVersion="$(MicrosoftDotNetWebProjectTemplates100PackageVersion)" UseVersionForTemplateInstallPath="true" />
25+
<Bundled100Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftDotNetWinFormsProjectTemplatesPackageVersion)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
26+
<Bundled100Templates Include="Microsoft.Dotnet.Wpf.ProjectTemplates" PackageVersion="$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
2727
</ItemGroup>
2828

2929
<ItemGroup>

‎src/SourceBuild/patches/wpf/0001-Create-arch-neutral-packages-when-building-inside-th.patch‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From 2c9670d56a70dc78cad3f94cd815fc75638fd034 Mon Sep 17 00:00:00 2001
2+
From: Viktor Hofer <[email protected]>
3+
Date: Tue, 4 Feb 2025 23:47:43 +0100
4+
Subject: [PATCH] Create arch neutral packages when building inside the VMR
5+
(#10405)
6+
7+
Backport: https://github.com/dotnet/wpf/pull/10405
8+
9+
---
10+
packaging/Directory.Build.props | 5 +++--
11+
1 file changed, 3 insertions(+), 2 deletions(-)
12+
13+
diff --git a/packaging/Directory.Build.props b/packaging/Directory.Build.props
14+
index a1f50ce3d..15516fade 100644
15+
--- a/packaging/Directory.Build.props
16+
+++ b/packaging/Directory.Build.props
17+
@@ -16,10 +16,11 @@
18+
Set $(IsPackable) = true, except when
19+
$(CreateArchNeutralPackage) == true && $(Platform) != x86
20+
The idea here is that for arch-neutral packages, only the x86 build phase will generate the nuget package
21+
- The platform/RID specific packages will be generated in their respective $(Platform) specific build phases
22+
+ The platform/RID specific packages will be generated in their respective $(Platform) specific build phases.
23+
+ Platform neutral packages should always get generated when building the product (DotNetBuild=true).
24+
-->
25+
<IsPackable>true</IsPackable>
26+
- <IsPackable Condition="('$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32' and '$(Platform)'!='x86') and '$(CreateArchNeutralPackage)'=='true'">false</IsPackable>
27+
+ <IsPackable Condition="('$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32' and '$(Platform)'!='x86') and '$(CreateArchNeutralPackage)'=='true' and '$(DotNetBuild)' != 'true'">false</IsPackable>
28+
</PropertyGroup>
29+
30+
<PropertyGroup>

‎src/SourceBuild/patches/wpf/0004-Fix-the-ArtifactsPackagingDir-on-win-x64.patch‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From 5d5f1c9eff148801ac0116c5b33d3b1608340d30 Mon Sep 17 00:00:00 2001
2+
From: Viktor Hofer <[email protected]>
3+
Date: Wed, 5 Feb 2025 12:44:01 +0100
4+
Subject: [PATCH 4/4] Fix the ArtifactsPackagingDir on win-x64
5+
6+
Backport: https://github.com/dotnet/wpf/pull/10411
7+
8+
---
9+
eng/WpfArcadeSdk/tools/Packaging.props | 3 +--
10+
1 file changed, 1 insertion(+), 2 deletions(-)
11+
12+
diff --git a/eng/WpfArcadeSdk/tools/Packaging.props b/eng/WpfArcadeSdk/tools/Packaging.props
13+
index ad1383c18..b052f0484 100644
14+
--- a/eng/WpfArcadeSdk/tools/Packaging.props
15+
+++ b/eng/WpfArcadeSdk/tools/Packaging.props
16+
@@ -1,7 +1,6 @@
17+
<Project>
18+
<PropertyGroup>
19+
- <ArtifactsPackagingDir Condition="'$(ArtifactsPackagingDir)'=='' and $(Platform.EndsWith('x64'))">$(ArtifactsDir)packaging\$(Configuration)\$(Platform)\</ArtifactsPackagingDir>
20+
- <ArtifactsPackagingDir Condition="'$(ArtifactsPackagingDir)'=='' and !$(Platform.EndsWith('x64'))">$(ArtifactsDir)packaging\$(Configuration)\</ArtifactsPackagingDir>
21+
+ <ArtifactsPackagingDir Condition="'$(ArtifactsPackagingDir)'==''">$(ArtifactsDir)packaging\$(Configuration)\</ArtifactsPackagingDir>
22+
23+
<!-- We like using RID prefix when generating nuget package names -->
24+
<PackageRuntimeIdentifierPrefix Condition="'$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32'">runtime.win-$(Platform)</PackageRuntimeIdentifierPrefix>

0 commit comments

Comments
 (0)