Skip to content
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

Create dependencies for aspnetcore template packages #46530

Merged
merged 4 commits into from
Feb 5, 2025
Merged

Create dependencies for aspnetcore template packages #46530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c7a92d
Create dependencies for aspnetcore template packages.
ViktorHofer Feb 4, 2025
6c49862
Update .NET 10.0 templates definitions
ViktorHofer Feb 4, 2025
fa5b3b8
Merge branch 'main' into LiveTemplateInVMRUsing
akoeplinger Feb 5, 2025
acced5a
added wpf patches
ViktorHofer Feb 5, 2025
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
64 changes: 36 additions & 28 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,6 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6908aead3a8b313798c381d5e435e9e6068301a7</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.25073.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="10.0.0-alpha.2.25073.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.14.0-preview.1.11">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
Expand Down Expand Up @@ -364,6 +356,42 @@
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-alpha.2.25073.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="10.0.0-alpha.2.25073.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="10.0.0-alpha.2.25073.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
</Dependency>
<Dependency Name="Microsoft.JSInterop" Version="10.0.0-alpha.2.25073.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="10.0.0-alpha.2.25073.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.25073.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="10.0.0-alpha.2.25073.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Web.ItemTemplates.10.0" Version="10.0.0-alpha.2.25073.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Web.ProjectTemplates.10.0" Version="10.0.0-alpha.2.25073.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="10.0.0-alpha.2.25073.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
Expand All @@ -388,22 +416,6 @@
<Sha>b16f63a0c4e003acad74eb3f17d648c6ec17622b</Sha>
<SourceBuild RepoName="razor" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-alpha.2.25073.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="10.0.0-alpha.2.25073.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="10.0.0-alpha.2.25073.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
</Dependency>
<Dependency Name="Microsoft.JSInterop" Version="10.0.0-alpha.2.25073.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.2.25102.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
Expand Down Expand Up @@ -554,10 +566,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>37b1764e19aceaa545d8433c490b850538b8905a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="10.0.0-alpha.2.25073.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.2.25104.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>37b1764e19aceaa545d8433c490b850538b8905a</Sha>
Expand Down
10 changes: 3 additions & 7 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-preview.2.25102.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotNetWinFormsProjectTemplatesPackageVersion>10.0.0-preview.2.25102.1</MicrosoftDotNetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
Expand Down Expand Up @@ -237,6 +237,8 @@
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.25073.4</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.25073.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.25073.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<MicrosoftDotNetWebItemTemplates100PackageVersion>10.0.0-alpha.2.25073.4</MicrosoftDotNetWebItemTemplates100PackageVersion>
<MicrosoftDotNetWebProjectTemplates100PackageVersion>10.0.0-alpha.2.25073.4</MicrosoftDotNetWebProjectTemplates100PackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.25073.4</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.25073.4</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.25073.4</dotnetuserjwtsPackageVersion>
Expand All @@ -253,12 +255,6 @@
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-preview.2.25103.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-preview.2.25103.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Template versions">
<!-- 10.0 Template versions -->
<AspNetCorePackageVersionFor100Templates>$(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)</AspNetCorePackageVersionFor100Templates>
<MicrosoftDotnetWinFormsProjectTemplates100PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates100PackageVersion>
<MicrosoftDotNetWpfProjectTemplates100PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates100PackageVersion>
</PropertyGroup>
<PropertyGroup Label="Infrastructure and test only dependencies">
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>10.0.0-preview.24602.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
Expand Down
8 changes: 4 additions & 4 deletions src/Installer/redist-installer/targets/BundledTemplates.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
</Target>

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

<ItemGroup>
Expand Down
30 changes: 30 additions & 0 deletions src/SourceBuild/patches/wpf/0001-Create-arch-neutral-packages-when-building-inside-th.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
From 2c9670d56a70dc78cad3f94cd815fc75638fd034 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <[email protected]>
Date: Tue, 4 Feb 2025 23:47:43 +0100
Subject: [PATCH] Create arch neutral packages when building inside the VMR
(#10405)

Backport: https://github.com/dotnet/wpf/pull/10405

---
packaging/Directory.Build.props | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packaging/Directory.Build.props b/packaging/Directory.Build.props
index a1f50ce3d..15516fade 100644
--- a/packaging/Directory.Build.props
+++ b/packaging/Directory.Build.props
@@ -16,10 +16,11 @@
Set $(IsPackable) = true, except when
$(CreateArchNeutralPackage) == true && $(Platform) != x86
The idea here is that for arch-neutral packages, only the x86 build phase will generate the nuget package
- The platform/RID specific packages will be generated in their respective $(Platform) specific build phases
+ The platform/RID specific packages will be generated in their respective $(Platform) specific build phases.
+ Platform neutral packages should always get generated when building the product (DotNetBuild=true).
-->
<IsPackable>true</IsPackable>
- <IsPackable Condition="('$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32' and '$(Platform)'!='x86') and '$(CreateArchNeutralPackage)'=='true'">false</IsPackable>
+ <IsPackable Condition="('$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32' and '$(Platform)'!='x86') and '$(CreateArchNeutralPackage)'=='true' and '$(DotNetBuild)' != 'true'">false</IsPackable>
</PropertyGroup>

<PropertyGroup>
24 changes: 24 additions & 0 deletions src/SourceBuild/patches/wpf/0004-Fix-the-ArtifactsPackagingDir-on-win-x64.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From 5d5f1c9eff148801ac0116c5b33d3b1608340d30 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <[email protected]>
Date: Wed, 5 Feb 2025 12:44:01 +0100
Subject: [PATCH 4/4] Fix the ArtifactsPackagingDir on win-x64

Backport: https://github.com/dotnet/wpf/pull/10411

---
eng/WpfArcadeSdk/tools/Packaging.props | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/Packaging.props b/eng/WpfArcadeSdk/tools/Packaging.props
index ad1383c18..b052f0484 100644
--- a/eng/WpfArcadeSdk/tools/Packaging.props
+++ b/eng/WpfArcadeSdk/tools/Packaging.props
@@ -1,7 +1,6 @@
<Project>
<PropertyGroup>
- <ArtifactsPackagingDir Condition="'$(ArtifactsPackagingDir)'=='' and $(Platform.EndsWith('x64'))">$(ArtifactsDir)packaging\$(Configuration)\$(Platform)\</ArtifactsPackagingDir>
- <ArtifactsPackagingDir Condition="'$(ArtifactsPackagingDir)'=='' and !$(Platform.EndsWith('x64'))">$(ArtifactsDir)packaging\$(Configuration)\</ArtifactsPackagingDir>
+ <ArtifactsPackagingDir Condition="'$(ArtifactsPackagingDir)'==''">$(ArtifactsDir)packaging\$(Configuration)\</ArtifactsPackagingDir>

<!-- We like using RID prefix when generating nuget package names -->
<PackageRuntimeIdentifierPrefix Condition="'$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32'">runtime.win-$(Platform)</PackageRuntimeIdentifierPrefix>
Loading