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

Jump to bottom

Convert ref and runtime packs to use the SharedFramework SDK and Arcade's installer tooling #58612

Open
wants to merge 56 commits into
base: main
Choose a base branch
from
+711 −3,774
Open

Convert ref and runtime packs to use the SharedFramework SDK and Arcade's installer tooling #58612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
ff532f2
Add an sfxproj for the ref pack for Microsoft.AspNetCore.App. IT has …
jkoritzinsky Oct 22, 2024
c26b20d
Add sfxproj-based runtime framework project
jkoritzinsky Oct 23, 2024
1ff7845
Produce the targeting pack archives
jkoritzinsky Oct 23, 2024
789e9bf
Build the runtime archive. There's some extra rebuilding now, so need…
jkoritzinsky Oct 23, 2024
edd7c4e
Add a (mostly correct, some TODOs) composite runtime image and archive.
jkoritzinsky Oct 23, 2024
ef9422e
Use traversal projects to ensure that building the runtime archive pr…
jkoritzinsky Oct 23, 2024
4b6dd92
Add the new .deb packaging to the targeting pack
jkoritzinsky Oct 23, 2024
f6de9ec
Add the aspnetcore runtime deb package to the sfxproj
jkoritzinsky Oct 23, 2024
ad492ac
Enable building RPM packages
jkoritzinsky Oct 23, 2024
cf0e833
Publish from the new-style projects to the correct subfolders for con…
jkoritzinsky Oct 23, 2024
8590cb7
Remove a TODO that's being addressed
jkoritzinsky Oct 24, 2024
f5ab929
Add support for partial R2R rooting based on https://github.com/dotne…
jkoritzinsky Oct 24, 2024
28a3d39
Reuse global properties and remove TODO addresed in corresponding Arc…
jkoritzinsky Oct 24, 2024
8df753c
Replace old shared framework projects and Linux installers with the n…
jkoritzinsky Oct 24, 2024
ec21b15
Remove the NoTargets SDK, ended up using the Traversal SDK instead.
jkoritzinsky Oct 24, 2024
214ede2
Fix path to runtime pack for manifest
jkoritzinsky Oct 24, 2024
d46c78a
Don't reference the installers package on Windows. We don't want to b…
jkoritzinsky Oct 24, 2024
940cba6
Fix reference from aspnetcore-runtime and sequence the projects into …
jkoritzinsky Oct 24, 2024
46431f2
Profive projects to build when only -buildinstallers is passed. This …
jkoritzinsky Oct 24, 2024
d19ea9a
Fix the path of the runtime list for testing.
jkoritzinsky Oct 24, 2024
332b97b
Set property with file name
jkoritzinsky Oct 24, 2024
3e7e74b
Disable APICompat for the archive projects.
jkoritzinsky Oct 25, 2024
ffc4ecf
Fix expected output directory for deb/rpm/targz/zip to be the shippin…
jkoritzinsky Oct 25, 2024
b176f09
Fix including zips (as wixpacks are still in the intsallers folder)
jkoritzinsky Oct 28, 2024
5ed00aa
Build the shared frameworks via the transitive SDK proj only and make…
jkoritzinsky Oct 29, 2024
58ce10e
Merge branch 'sfx-aspnetcore' of github.com:jkoritzinsky/aspnetcore i…
jkoritzinsky Oct 29, 2024
faa4b35
Merge branch 'main' of https://github.com/dotnet/aspnetcore into sfx-…
jkoritzinsky Oct 29, 2024
7d00f4c
Add PGO data via direct references to the MIBC files instead of flowi…
jkoritzinsky Oct 29, 2024
b274123
Don't exclude the runtime archive traversal proj from the source-only…
jkoritzinsky Oct 29, 2024
18fe593
Add some makedirs
jkoritzinsky Oct 30, 2024
49187e3
Merge branch 'main' of github.com:dotnet/aspnetcore into sfx-aspnetcore
jkoritzinsky Nov 1, 2024
c6c4e71
Don't try to extract the runtime we skipped downloading
jkoritzinsky Nov 1, 2024
b84d04d
Always prefer the ref assemblies in the transport pack over the impl …
jkoritzinsky Nov 1, 2024
e712bc7
Add the right PackageOverrides.txt entries and make sure we exclude a…
jkoritzinsky Nov 1, 2024
110adb8
Merge branch 'main' of https://github.com/dotnet/aspnetcore into sfx-…
jkoritzinsky Nov 1, 2024
801f78b
Enable building all projects using the sharedfx sdk in source-build
jkoritzinsky Nov 1, 2024
cd60089
Don't exclude the composite archive from source build.
jkoritzinsky Nov 1, 2024
0ba6470
Write out the aspnetcore_base_runtime.version file
jkoritzinsky Nov 2, 2024
80bfc79
Update aspnetcore-base-runtime.proj
jkoritzinsky Nov 2, 2024
1795fc9
Don't R2R when explicitly requested not to
jkoritzinsky Nov 4, 2024
ad87dc3
Merge branch 'main' of https://github.com/dotnet/aspnetcore into sfx-…
jkoritzinsky Nov 5, 2024
44e287e
Merge branch 'main' into sfx-aspnetcore
jkoritzinsky Nov 5, 2024
b1b144d
Update .NET SDK to get composite image fix
jkoritzinsky Nov 5, 2024
b6ff5fb
Use the new RPM tooling and build debs/rpms in the regular build step…
jkoritzinsky Nov 5, 2024
6aed496
Remove rpmpkg references and update ref pack baseline version
jkoritzinsky Nov 5, 2024
555c39e
Fix version string
jkoritzinsky Nov 5, 2024
72f970c
Remove installers group on Build.props as the "managed" build will no…
jkoritzinsky Nov 5, 2024
0b25d0e
Use Arcade RPM tooling for the Runtime sfxproj
jkoritzinsky Nov 5, 2024
1f1faf6
Revert "Update .NET SDK to get composite image fix"
jkoritzinsky Nov 5, 2024
ba90cf1
Merge branch 'main' of https://github.com/dotnet/aspnetcore into sfx-…
jkoritzinsky Nov 7, 2024
482c5e4
Merge branch 'main' of github.com:dotnet/aspnetcore into sfx-aspnetcore
jkoritzinsky Nov 9, 2024
b03e202
Merge branch 'main' of github.com:dotnet/aspnetcore into sfx-aspnetcore
jkoritzinsky Nov 12, 2024
ed7c875
Don't pack the ref pack when only packing rid-specific packages
jkoritzinsky Nov 13, 2024
f1a7846
Remove RpmOwnedDirectory items as they're now provided by the SharedF…
jkoritzinsky Nov 13, 2024
cd7c2c6
Don't build installers in source-build
jkoritzinsky Nov 13, 2024
0d1edd2
Merge branch 'main' into sfx-aspnetcore
RussKie Nov 14, 2024
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
57 changes: 1 addition & 56 deletions .azure/pipelines/ci-public.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,6 @@ variables:
value: true
- template: /eng/common/templates/variables/pool-providers.yml

resources:
containers:
- container: debpkg
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg

- container: rpmpkg
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm

stages:
- stage: build
displayName: Build
Expand Down Expand Up @@ -313,43 +305,13 @@ stages:
--ci
--arch x64
--pack
--build-installers
--all
--no-build-java
-p:OnlyPackPlatformSpecificPackages=true
$(_BuildArgs)
$(_InternalRuntimeDownloadArgs)
displayName: Run build.sh
- script: ./eng/build.sh
--ci
--nobl
--arch x64
--build-installers
--no-build-deps
--no-build-nodejs
-p:OnlyPackPlatformSpecificPackages=true
-p:BuildRuntimeArchive=false
-p:LinuxInstallerType=deb
$(_BuildArgs)
$(_InternalRuntimeDownloadArgs)
displayName: Build Debian installers
target: debpkg
- script: ./eng/build.sh
--ci
--nobl
--arch x64
--build-installers
--no-build-deps
--no-build-nodejs
--publish
-p:OnlyPackPlatformSpecificPackages=true
-p:BuildRuntimeArchive=false
-p:LinuxInstallerType=rpm
-p:AssetManifestFileName=aspnetcore-Linux_x64.xml
$(_BuildArgs)
$(_PublishArgs)
$(_InternalRuntimeDownloadArgs)
displayName: Build RPM installers
target: rpmpkg
artifacts:
- name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
Expand Down Expand Up @@ -410,23 +372,6 @@ stages:
$(_BuildArgs)
$(_InternalRuntimeDownloadArgs)
displayName: Run build.sh
- script: ./eng/build.sh
--ci
--nobl
--arch arm64
--build-installers
--no-build-deps
--no-build-nodejs
--publish
-p:OnlyPackPlatformSpecificPackages=true
-p:BuildRuntimeArchive=false
-p:LinuxInstallerType=rpm
-p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
$(_BuildArgs)
$(_PublishArgs)
$(_InternalRuntimeDownloadArgs)
displayName: Build RPM installers
target: rpmpkg
artifacts:
- name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
Expand Down
55 changes: 1 addition & 54 deletions .azure/pipelines/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,6 @@ variables:
- template: /eng/common/templates-official/variables/pool-providers.yml@self

resources:
containers:
- container: debpkg
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg

- container: rpmpkg
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
repositories:
# Repo: 1ESPipelineTemplates/1ESPipelineTemplates
- repository: 1esPipelines
Expand Down Expand Up @@ -383,42 +377,12 @@ extends:
--arch x64
--pack
--all
--build-installers
--no-build-java
-p:OnlyPackPlatformSpecificPackages=true
$(_BuildArgs)
$(_InternalRuntimeDownloadArgs)
displayName: Run build.sh
- script: ./eng/build.sh
--ci
--nobl
--arch x64
--build-installers
--no-build-deps
--no-build-nodejs
-p:OnlyPackPlatformSpecificPackages=true
-p:BuildRuntimeArchive=false
-p:LinuxInstallerType=deb
$(_BuildArgs)
$(_InternalRuntimeDownloadArgs)
displayName: Build Debian installers
target: debpkg
- script: ./eng/build.sh
--ci
--nobl
--arch x64
--build-installers
--no-build-deps
--no-build-nodejs
--publish
-p:OnlyPackPlatformSpecificPackages=true
-p:BuildRuntimeArchive=false
-p:LinuxInstallerType=rpm
-p:AssetManifestFileName=aspnetcore-Linux_x64.xml
$(_BuildArgs)
$(_PublishArgs)
$(_InternalRuntimeDownloadArgs)
displayName: Build RPM installers
target: rpmpkg
artifacts:
- name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
Expand Down Expand Up @@ -479,23 +443,6 @@ extends:
$(_BuildArgs)
$(_InternalRuntimeDownloadArgs)
displayName: Run build.sh
- script: ./eng/build.sh
--ci
--nobl
--arch arm64
--build-installers
--no-build-deps
--no-build-nodejs
--publish
-p:OnlyPackPlatformSpecificPackages=true
-p:BuildRuntimeArchive=false
-p:LinuxInstallerType=rpm
-p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
$(_BuildArgs)
$(_PublishArgs)
$(_InternalRuntimeDownloadArgs)
displayName: Build RPM installers
target: rpmpkg
artifacts:
- name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
Expand Down
4 changes: 2 additions & 2 deletions AspNetCore.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Framework", "Framework", "{
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "App.Runtime", "App.Runtime", "{F1A6BA04-853E-43B5-B27E-54558603837B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Runtime", "src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj", "{3163C56E-99BC-4BD1-8880-4F94A2407741}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Runtime", "src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.sfxproj", "{3163C56E-99BC-4BD1-8880-4F94A2407741}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test", "src\Razor\Razor\test\Microsoft.AspNetCore.Razor.Test.csproj", "{776BFCDC-8591-4E3D-BD0D-858A188A033D}"
EndProject
Expand Down Expand Up @@ -1354,7 +1354,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FilePr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Embedded.Tests", "src\FileProviders\Embedded\test\Microsoft.Extensions.FileProviders.Embedded.Tests.csproj", "{B06ADD57-E855-4D8C-85DC-B323509AE540}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Ref", "src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj", "{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Ref", "src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.sfxproj", "{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.UnitTests", "src\Framework\test\Microsoft.AspNetCore.App.UnitTests.csproj", "{010A9638-F20E-4FE6-A186-85732BFC9CB0}"
EndProject
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.BeforeCommonTargets.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Condition="'$(ExcludeFromSourceOnlyBuild)' == '' and
'$(DotNetBuildSourceOnly)' == 'true' and
'$(IsAspNetCoreApp)' != 'true' and
'$(MSBuildProjectName)' != '$(TargetingPackName)' and
'$(UsingMicrosoftDotNetSharedFrameworkSdk)' != 'true' and
'$(IsAnalyzersProject)' != 'true' and
'$(IsProjectTemplateProject)' != 'true'">true</ExcludeFromSourceOnlyBuild>

Expand Down
1 change: 1 addition & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@
<Import Project="eng\targets\FSharp.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.fsproj'" />
<Import Project="eng\targets\Wix.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
<Import Project="eng\targets\Java.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.javaproj'" />
<Import Project="eng\targets\Sfx.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.sfxproj'" />
<Import Project="eng\testing\linker\trimmingTests.targets" Condition="'$(IsPublishedAppTestProject)' == 'true'" />
<Import Project="eng\targets\Helix.targets" Condition=" $(IsTestProject) " />
<Import Project="eng\targets\FunctionalTestWithAssets.targets"
Expand Down
12 changes: 4 additions & 8 deletions eng/Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,6 @@
<ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\WindowsHostingBundle\WindowsHostingBundle.wixproj" AdditionalProperties="Platform=x86" />
</ItemGroup>

<ItemGroup Condition="'$(BuildInstallers)' == 'true' AND ('$(TargetRuntimeIdentifier)' == 'linux-x64' OR '$(TargetRuntimeIdentifier)' == 'linux-arm64')">
<ProjectToBuild Condition=" '$(LinuxInstallerType)' == 'deb' "
Include="$(RepoRoot)src\Installers\Debian\**\*.*proj" />
<ProjectToBuild Condition=" '$(LinuxInstallerType)' == 'rpm' "
Include="$(RepoRoot)src\Installers\Rpm\**\*.*proj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetOsName)' == 'win' AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64' OR '$(TargetArchitecture)' == 'arm64') ">
<NativeProjects Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=x64" />
<NativeProjects Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=Win32" />
Expand Down Expand Up @@ -173,8 +166,11 @@
the entire pattern will silently fail to evaluate correctly.
-->
<DotNetProjects Include="
$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj;
$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.sfxproj;
$(RepoRoot)src\Framework\App.Ref.Internal\src\Microsoft.AspNetCore.App.Ref.Internal.csproj;
$(RepoRoot)src\Framework\App.Runtime\src\aspnetcore-runtime.proj;
$(RepoRoot)src\Framework\App.Runtime\src\aspnetcore-runtime-composite.proj;
$(RepoRoot)src\Framework\App.Runtime\src\aspnetcore-base-runtime.proj;
$(RepoRoot)src\Framework\AspNetCoreAnalyzers\test\Microsoft.AspNetCore.App.Analyzers.Test.csproj;
$(RepoRoot)src\Framework\test\Microsoft.AspNetCore.App.UnitTests.csproj;
$(RepoRoot)src\Caching\**\*.*proj;
Expand Down
3 changes: 0 additions & 3 deletions eng/DotNetBuild.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,9 @@
<!--
Add the internal installers artifacts required by dotnet/installer.
-->
<IntermediateNupkgArtifactFile Include="$(InstallersArtifactsDir)aspnetcore-runtime-*.tar.gz" />
<IntermediateNupkgArtifactFile Include="$(InstallersArtifactsDir)aspnetcore_base_runtime.version" />
<IntermediateNupkgArtifactFile Include="$(InstallersArtifactsDir)aspnetcore-runtime-*.msi" />
<IntermediateNupkgArtifactFile Include="$(InstallersArtifactsDir)aspnetcore-runtime-*.pkg" />
<IntermediateNupkgArtifactFile Include="$(InstallersArtifactsDir)aspnetcore-runtime-*.deb" />
<IntermediateNupkgArtifactFile Include="$(InstallersArtifactsDir)aspnetcore-runtime-*.rpm" />
</ItemGroup>
</Target>

Expand Down
12 changes: 7 additions & 5 deletions eng/Publishing.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
'$(PostBuildSign)' != 'true' and
'$(DotNetBuildRepo)' != 'true'">false</EnableDefaultArtifacts>

<PublishInstallerBaseVersion Condition="'$(PublishInstallerBaseVersion)' == '' and
<PublishInstallerBaseVersion Condition="'$(PublishInstallerBaseVersion)' == '' and
('$(OS)' == 'Windows_NT' or '$(DotNetBuildOrchestrator)' == 'true')">true</PublishInstallerBaseVersion>
<!-- This avoids creating VS.*.symbols.nupkg packages that are identical to the original package. -->
<AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>
Expand All @@ -31,13 +31,15 @@
<_InstallersToPublish Include="$(ArtifactsDir)installers\**\*.version" UploadPathSegment="Runtime" Condition="'$(PublishInstallerBaseVersion)' == 'true'" />

<!-- The following installers create checksums -->
<_InstallersToPublish Include="$(ArtifactsDir)installers\**\*.deb" UploadPathSegment="Runtime" ChecksumPath="%(FullPath).sha512" />
<_InstallersToPublish Include="$(ArtifactsDir)packages\**\*.deb" UploadPathSegment="Runtime" ChecksumPath="%(FullPath).sha512" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it the common pattern to publish installers to the packages dir?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, dotnet/runtime and dotnet/windowsdesktop publish all installers to the packages dir.

<_InstallersToPublish Include="$(ArtifactsDir)packages\**\*.rpm" UploadPathSegment="Runtime" ChecksumPath="%(FullPath).sha512" />
<_InstallersToPublish Include="$(ArtifactsDir)packages\**\*.tar.gz" UploadPathSegment="Runtime" ChecksumPath="%(FullPath).sha512" />
<_InstallersToPublish Include="$(ArtifactsDir)packages\**\*.zip" UploadPathSegment="Runtime" />

<_InstallersToPublish Include="$(ArtifactsDir)installers\**\*.exe" UploadPathSegment="Runtime" ChecksumPath="%(FullPath).sha512" />
<_InstallersToPublish Include="$(ArtifactsDir)installers\**\*.msi" UploadPathSegment="Runtime" ChecksumPath="%(FullPath).sha512" />
<_InstallersToPublish Include="$(ArtifactsDir)installers\**\*.rpm" UploadPathSegment="Runtime" ChecksumPath="%(FullPath).sha512" />
<_InstallersToPublish Include="$(ArtifactsDir)installers\**\*.tar.gz" UploadPathSegment="Runtime" ChecksumPath="%(FullPath).sha512" />
<_InstallersToPublish Include="$(ArtifactsDir)installers\**\*.wixlib" UploadPathSegment="Runtime" ChecksumPath="%(FullPath).sha512" />
<_InstallersToPublish Include="$(ArtifactsDir)installers\**\*.zip" UploadPathSegment="Runtime" >
<_InstallersToPublish Include="$(ArtifactsDir)installers\**\*.zip" UploadPathSegment="Runtime">
<!-- Exclude wixpack.zip files from checksum generation -->
<ChecksumPath Condition="$([System.String]::Copy('%(Filename)%(Extension)').EndsWith('.wixpack.zip')) != 'true'">%(FullPath).sha512</ChecksumPath>
</_InstallersToPublish>
Expand Down
2 changes: 1 addition & 1 deletion eng/Signing.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<CommonFilesToSign Include="$(ArtifactsPackagesDir)**\*.nupkg" />
<CommonFilesToSign Include="$(VisualStudioSetupOutputPath)**\*.vsix" />
<CommonFilesToSign Include="$(ArtifactsPackagesDir)**\*.jar" />
<CommonFilesToSign Include="$(ArtifactsDir)installers\$(Configuration)\**\*.zip" />
<CommonFilesToSign Include="$(ArtifactsDir)packages\$(Configuration)\**\*.zip" />
<CommonFilesToSign Remove="$(ArtifactsDir)installers\$(Configuration)\**\*.wixpack.zip" Condition="'$(PostBuildSign)' != 'true'" />
</ItemGroup>
<Choose>
Expand Down
28 changes: 28 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@
<Sha>e882d5925ca55013d5810ac51e36574a65c5da84</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24562.15">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24562.15">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e882d5925ca55013d5810ac51e36574a65c5da84</Sha>
Expand All @@ -410,6 +414,10 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e882d5925ca55013d5810ac51e36574a65c5da84</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24560.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0-preview.1.24560.1">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>3f1f59cd52c58ab7e5666ba4c8ea6176f606f3d7</Sha>
Expand All @@ -430,6 +438,26 @@
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>9d7532585ce71e30ab55f0364d3cecccaf0775d1</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.24462.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>9d7532585ce71e30ab55f0364d3cecccaf0775d1</Sha>
</Dependency>
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>9d7532585ce71e30ab55f0364d3cecccaf0775d1</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>9d7532585ce71e30ab55f0364d3cecccaf0775d1</Sha>
</Dependency>
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>9d7532585ce71e30ab55f0364d3cecccaf0775d1</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.2.0-beta.24527.1">
<Uri>https://github.com/dotnet/symreader</Uri>
Expand Down
7 changes: 7 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24562.15</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24562.15</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24562.15</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24562.15</MicrosoftDotNetRemoteExecutorVersion>
Expand All @@ -178,6 +179,12 @@
<!-- Packages from dotnet/xdt -->
<MicrosoftWebXdtVersion>9.0.0-preview.24522.2</MicrosoftWebXdtVersion>
<MicrosoftSourceBuildIntermediatexdtVersion>9.0.0-preview.24522.2</MicrosoftSourceBuildIntermediatexdtVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationwindows_ntx86MIBCRuntimeVersion>
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationwindows_ntarm64MIBCRuntimeVersion>
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationlinuxx64MIBCRuntimeVersion>
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationlinuxarm64MIBCRuntimeVersion>
</PropertyGroup>
<!--

Expand Down
Loading
Loading