Skip to content

Merging internal commits for release/8.0 #58898

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

Merged
merged 19 commits into from
Nov 13, 2024
Merged

Merging internal commits for release/8.0 #58898

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c6a133e
Merged PR 43129: [internal/release/8.0] Update dependencies from dnce…
Sep 24, 2024
5696438
Merge commit 'cec987b5a685cd43478df7abf5a78893a8f2c765'
Oct 2, 2024
073c9fe
Merge commit 'dfe2137ce88bbcf7116a55d8ed41f5d1219be8f2'
Oct 2, 2024
74acf9e
Merge commit 'b68823d4a484638f2409caf0475f017afbec5584'
Oct 7, 2024
e4ac69a
Merge commit '2651bb9970f1804cbc72f025da8c0f8e4de5e3ee'
Oct 7, 2024
57672f4
Merge commit '878a52c6a863302c483b0d73d9944ed8005a0d61'
Oct 8, 2024
20b27a0
Merged PR 43131: [internal/release/8.0] Update dependencies from dnce…
Oct 15, 2024
127af9e
Merged PR 43827: revert OOB package shas
vseanreesermsft Oct 16, 2024
4c938ae
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 17, 2024
fc878b7
Merged PR 43936: [internal/release/8.0] Update dependencies from dnce…
Oct 18, 2024
cb771e5
Merged PR 44008: [internal/release/8.0] Merge from public
vseanreesermsft Oct 18, 2024
155b8bf
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 18, 2024
bb08e05
Merged PR 44022: [internal/release/8.0] Update dependencies from dnce…
Oct 19, 2024
53c99d3
[internal/release/8.0] Updated NuGet.config - add feed for efcore 3b2…
vseanreesermsft Oct 21, 2024
8e8eded
Merged PR 44051: [internal/release/8.0] Updated NuGet.config - add fe…
vseanreesermsft Oct 21, 2024
809a619
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 21, 2024
4757647
Merged PR 44074: [internal/release/8.0] Update dependencies from dnce…
Oct 21, 2024
8eb7a80
Merge commit '47576478939fdd59b4400ad135f47938af486ab3' into internal…
vseanreesermsft Nov 12, 2024
4d7ccac
Update baseline, SDK
wtgodbe Nov 12, 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
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,26 +376,26 @@
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>abda8e3bfa78319363526b5a5f86863ec979940e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24426.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24504.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
<Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24426.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24504.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
<Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24426.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24504.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
<Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24426.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24504.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
<Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24426.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24504.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
<Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="8.1.0-preview.23604.1">
<Uri>https://github.com/dotnet/extensions</Uri>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24426.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24426.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24426.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24504.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24504.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24504.2</MicrosoftDotNetRemoteExecutorVersion>
<!-- Packages from dotnet/source-build-externals -->
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.24379.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
<!-- Packages from dotnet/source-build-reference-packages -->
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"msbuild-sdks": {
"Yarn.MSBuild": "1.22.19",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24426.2",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24426.2"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24504.2",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24504.2"
}
}
7 changes: 6 additions & 1 deletion src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
<Bundle Name="$(var.BundleName)" Version="$(var.BundleVersion)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.BundleUpgradeCode)">
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
<bal:WixStandardBootstrapperApplication LicenseUrl="https://go.microsoft.com/fwlink/?LinkId=329770"
Expand All @@ -11,6 +12,10 @@
<PayloadGroupRef Id="PG_Resources"/>
</BootstrapperApplicationRef>

<util:RegistrySearchRef Id="RemovePreviousVersionRegistryKeySearch"/>
<util:RegistrySearchRef Id="RemoveSpecificPreviousVersionRegistryKeyExistsSearch"/>
<util:RegistrySearchRef Id="RemoveSpecificPreviousVersionRegistryKeySearch"/>

<!-- Ensure upgrades from 3.0.0 preview 1, 2, and 3. Conditioned for the 3.0.0 family. -->
<?if $(var.Version)=3.0.0.0?>
<?if $(var.Platform)=x86?>
Expand Down
5 changes: 5 additions & 0 deletions src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
</PropertyGroup>

<ItemGroup>
<WixExtension Include="WixUtilExtension">
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
<Name>WixUtilExtension</Name>
</WixExtension>
<WixExtension Include="WixDependencyExtension">
<HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>
<Name>WixDependencyExtension</Name>
Expand All @@ -25,6 +29,7 @@

<ItemGroup>
<Compile Include="Bundle.wxs" />
<Compile Include="$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix\bundle\upgradePolicies.wxs" />
<Content Include="thm.xml" />
</ItemGroup>

Expand Down
5 changes: 5 additions & 0 deletions src/Installers/Windows/WindowsHostingBundle/Bundle.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
<PayloadGroupRef Id="PG_Resources"/>
</BootstrapperApplicationRef>

<!-- Search references for upgrade policy keys -->
<util:RegistrySearchRef Id="RemovePreviousVersionRegistryKeySearch"/>
<util:RegistrySearchRef Id="RemoveSpecificPreviousVersionRegistryKeyExistsSearch"/>
<util:RegistrySearchRef Id="RemoveSpecificPreviousVersionRegistryKeySearch"/>

<!-- Ensure upgrades from 3.0.0 preview 1 and 2 (Preview 3 was not shipped). Conditioned for the 3.0.0 family. Hosting bundle simships x86/x64 so there's
a single set of upgrade codes. -->
<?if $(var.Version)=3.0.0.0?>
Expand Down
1 change: 1 addition & 0 deletions src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<Compile Include="Bundle.wxs" />
<Compile Include="DotNetCore.wxs" />
<Compile Include="SharedFramework.wxs" />
<Compile Include="$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix\bundle\upgradePolicies.wxs" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Installers/Windows/Wix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
NoLogo="true"
Cultures="en-us"
InstallerFile="%(WixInstallerFilesToProcess.Identity)"
AdditionalBasePaths="$(MSBuildProjectDirectory)"
AdditionalBasePaths="$(MSBuildProjectDirectory);$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix\bundle"
WixExtensions="@(WixExtension)"
Loc="@(EmbeddedResource)"
Sice="$(SuppressIces)"
Expand Down