Skip to content

Commit efbca57

Browse files
DeagleGrossDeagleGross
committed
Merge branch 'main' into dmkorolev/owin/environment-allocations
2 parents 8cd24a2 + 036ec9e commit efbca57

File tree

20 files changed

+215
-108
lines changed

20 files changed

+215
-108
lines changed

‎Directory.Build.props‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,37 @@
242242
<ArchiveExtension Condition="'$(TargetOsName)' == 'win'">.zip</ArchiveExtension>
243243
</PropertyGroup>
244244

245+
<PropertyGroup>
246+
<OfficialBaseURL>https://dotnetcli.azureedge.net/dotnet/</OfficialBaseURL>
247+
<!-- Allow overriding the public base URL for Unified Build scenarios to pull assets from a local build. -->
248+
<PublicBaseURL Condition="'$(PublicBaseURL)' == ''">https://dotnetbuilds.azureedge.net/public/</PublicBaseURL>
249+
<InternalBaseURL>https://dotnetbuilds.azureedge.net/internal/</InternalBaseURL>
250+
<!-- Allow overriding where installers are pulled in from previously completed jobs in Unified Build scenarios. -->
251+
<CrossArchitectureInstallerBasePath Condition="'$(CrossArchitectureInstallerBasePath)' == ''">$(InstallersOutputPath)</CrossArchitectureInstallerBasePath>
252+
</PropertyGroup>
253+
254+
<!-- Try various places to find the runtime. It's either released (use official version),
255+
public but un-released (use dotnetbuilds/public), or internal and unreleased (use dotnetbuilds/internal) -->
256+
<ItemGroup Condition="'$(DotNetBuild)' != 'true'">
257+
<RemoteAssetBaseURL Include="$(OfficialBaseURL)" />
258+
<RemoteAssetBaseURL Include="$(PublicBaseURL)" />
259+
<!-- Include the token here as we'll generate the URLs to download based on this item group. -->
260+
<RemoteAssetBaseURL Include="$(InternalBaseURL)"
261+
Condition=" '$(DotnetRuntimeSourceFeedKey)' != '' ">
262+
<token>$(DotnetRuntimeSourceFeedKey)</token>
263+
</RemoteAssetBaseURL>
264+
</ItemGroup>
265+
266+
<!--
267+
Only try downloading from the "public" base URL when doing a vertical build.
268+
In a vertical build, the public URL will be overwritten to point to local build artifacts.
269+
-->
270+
<ItemGroup Condition="'$(DotNetBuild)' == 'true'">
271+
<!-- MSBuild removes the '//' slashes when passing PublicBaseURL from the outer to the inner build. -->
272+
<RemoteAssetBaseURL Condition="$(PublicBaseURL.StartsWith('file:')) and '$(OS)' != 'Windows_NT'" Include="$([System.Text.RegularExpressions.Regex]::Replace('$(PublicBaseURL)', '%28file:\/{1,}%29%28.+%29', 'file:///%242'))" />
273+
<RemoteAssetBaseURL Condition="!$(PublicBaseURL.StartsWith('file:')) or '$(OS)' == 'Windows_NT'" Include="$(PublicBaseURL)" />
274+
</ItemGroup>
275+
245276
<PropertyGroup>
246277
<!-- PackageReadmeFile specifies the package readme file name in the package. PackageReadmeFilePath points to the package readme file on disk. -->
247278
<EnableDefaultPackageReadmeFile Condition="'$(EnableDefaultPackageReadmeFile)' == '' and '$(IsShipping)' != 'false'">true</EnableDefaultPackageReadmeFile>

‎eng/Build.props‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,13 @@
7171
</ItemGroup>
7272
</When>
7373
<Otherwise>
74-
<ItemGroup Condition=" '$(BuildInstallers)' == 'true' AND '$(TargetOsName)' == 'win' AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64' OR '$(TargetArchitecture)' == 'arm64') ">
74+
<PropertyGroup>
75+
<_BuildWindowsInstallers Condition="'$(BuildInstallers)' == 'true' AND '$(TargetOsName)' == 'win' AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64' OR '$(TargetArchitecture)' == 'arm64') ">true</_BuildWindowsInstallers>
76+
<_WixTargetPlatform Condition="'$(TargetArchitecture)' == 'x86' ">Win32</_WixTargetPlatform>
77+
<_WixTargetPlatform Condition="'$(TargetArchitecture)' == 'x64' ">x64</_WixTargetPlatform>
78+
<_WixTargetPlatform Condition="'$(TargetArchitecture)' == 'arm64' ">ARM64</_WixTargetPlatform>
79+
</PropertyGroup>
80+
<ItemGroup Condition="'$(DotNetBuild)' != 'true' and '$(_BuildWindowsInstallers)' == 'true' ">
7581
<!-- Build the ANCM custom action -->
7682
<ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj" AdditionalProperties="Platform=x64" />
7783
<ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj" AdditionalProperties="Platform=Win32" />
@@ -103,7 +109,26 @@
103109
<ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=x86" />
104110
<ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=arm64" />
105111

106-
<!-- Windows hosting bundled -->
112+
<!-- Windows hosting bundle -->
113+
<ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\WindowsHostingBundle\WindowsHostingBundle.wixproj" AdditionalProperties="Platform=x86" />
114+
</ItemGroup>
115+
116+
<!-- In a vertical build, only build the MSIs for the current vertical in the first pass and build the hosting bundle in the second pass -->
117+
<ItemGroup Condition="'$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1') and '$(_BuildWindowsInstallers)' == 'true'">
118+
<!-- Build the ANCM custom action -->
119+
<ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj" AdditionalProperties="Platform=$(_WixTargetPlatform)" />
120+
<!-- Build the ANCM msis -->
121+
<ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj" AdditionalProperties="Platform=$(_WixTargetPlatform)" />
122+
<ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\ANCMV2.wixproj" AdditionalProperties="Platform=$(_WixTargetPlatform)" />
123+
<!-- Build the targeting pack installers -->
124+
<ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\TargetingPack\TargetingPack.wixproj" AdditionalProperties="Platform=$(_WixTargetPlatform)" />
125+
<!-- Build the SharedFramework installers -->
126+
<ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=$(_WixTargetPlatform)" />
127+
<!-- Build the SharedFramework wixlib -->
128+
<ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=$(_WixTargetPlatform)" />
129+
</ItemGroup>
130+
131+
<ItemGroup Condition="'$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '2') and '$(BuildInstallers)' == 'true' AND '$(TargetOsName)' == 'win' and '$(TargetArchitecture)' == 'x64'">
107132
<ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\WindowsHostingBundle\WindowsHostingBundle.wixproj" AdditionalProperties="Platform=x86" />
108133
</ItemGroup>
109134

‎eng/Version.Details.xml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,9 @@
339339
<Sha>1a54480f52703fb45fac2a6b955247d33758383e</Sha>
340340
<SourceBuild RepoName="xdt" ManagedOnly="true" />
341341
</Dependency>
342-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.0-alpha.1.24554.1">
342+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.0-alpha.1.24558.1">
343343
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
344-
<Sha>e781442b88c4d939f06a94f38f24a5dc18c383d4</Sha>
344+
<Sha>1ebd9ce245112164207d961c0d2faea741c7c489</Sha>
345345
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
346346
</Dependency>
347347
<!-- Not updated automatically -->
@@ -372,9 +372,9 @@
372372
<Sha>a9ca41321284c0d1e423bfc240e9c9f8be970b8b</Sha>
373373
</Dependency>
374374
<!-- Intermediate is necessary for source build. -->
375-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="10.0.0-alpha.1.24528.1">
375+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="10.0.0-alpha.1.24554.1">
376376
<Uri>https://github.com/dotnet/source-build-externals</Uri>
377-
<Sha>a1ca5c7e17a24e3a55c911cc42f51881c1990dac</Sha>
377+
<Sha>f85bef35b34955a287e21a32f3107b24b9514723</Sha>
378378
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
379379
</Dependency>
380380
</ProductDependencies>
@@ -384,39 +384,39 @@
384384
<Uri>https://github.com/dotnet/runtime</Uri>
385385
<Sha>a9ca41321284c0d1e423bfc240e9c9f8be970b8b</Sha>
386386
</Dependency>
387-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24551.1">
387+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24560.1">
388388
<Uri>https://github.com/dotnet/arcade</Uri>
389-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
389+
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
390390
</Dependency>
391391
<!-- Intermediate is necessary for source build. -->
392-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24551.1">
392+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24560.1">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
394+
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
395395
<SourceBuild RepoName="arcade" ManagedOnly="true" />
396396
</Dependency>
397-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24551.1">
397+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24560.1">
398398
<Uri>https://github.com/dotnet/arcade</Uri>
399-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
399+
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24551.1">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24560.1">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
403+
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24551.1">
405+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24560.1">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
407+
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24551.1">
409+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24560.1">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
411+
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0-preview.1.24554.1">
413+
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0-preview.1.24560.1">
414414
<Uri>https://github.com/dotnet/extensions</Uri>
415-
<Sha>9eea77d211b201c6e60c5f5074238cca08ac1ba9</Sha>
415+
<Sha>3f1f59cd52c58ab7e5666ba4c8ea6176f606f3d7</Sha>
416416
</Dependency>
417-
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.1.0-preview.1.24554.1">
417+
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.1.0-preview.1.24560.1">
418418
<Uri>https://github.com/dotnet/extensions</Uri>
419-
<Sha>9eea77d211b201c6e60c5f5074238cca08ac1ba9</Sha>
419+
<Sha>3f1f59cd52c58ab7e5666ba4c8ea6176f606f3d7</Sha>
420420
</Dependency>
421421
<Dependency Name="NuGet.Frameworks" Version="6.2.4">
422422
<Uri>https://github.com/nuget/nuget.client</Uri>

‎eng/Versions.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@
142142
<SystemIOHashingVersion>10.0.0-alpha.1.24551.5</SystemIOHashingVersion>
143143
<SystemRuntimeCachingVersion>10.0.0-alpha.1.24551.5</SystemRuntimeCachingVersion>
144144
<!-- Packages from dotnet/extensions -->
145-
<MicrosoftExtensionsDiagnosticsTestingVersion>9.1.0-preview.1.24554.1</MicrosoftExtensionsDiagnosticsTestingVersion>
146-
<MicrosoftExtensionsTimeProviderTestingVersion>9.1.0-preview.1.24554.1</MicrosoftExtensionsTimeProviderTestingVersion>
145+
<MicrosoftExtensionsDiagnosticsTestingVersion>9.1.0-preview.1.24560.1</MicrosoftExtensionsDiagnosticsTestingVersion>
146+
<MicrosoftExtensionsTimeProviderTestingVersion>9.1.0-preview.1.24560.1</MicrosoftExtensionsTimeProviderTestingVersion>
147147
<!-- Packages from dotnet/efcore -->
148148
<dotnetefVersion>10.0.0-alpha.1.24531.1</dotnetefVersion>
149149
<MicrosoftEntityFrameworkCoreInMemoryVersion>10.0.0-alpha.1.24531.1</MicrosoftEntityFrameworkCoreInMemoryVersion>
@@ -165,14 +165,14 @@
165165
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
166166
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
167167
<!-- Packages from dotnet/arcade -->
168-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24551.1</MicrosoftDotNetBuildTasksInstallersVersion>
169-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24551.1</MicrosoftDotNetBuildTasksTemplatingVersion>
170-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24551.1</MicrosoftDotNetRemoteExecutorVersion>
171-
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24551.1</MicrosoftSourceBuildIntermediatearcadeVersion>
168+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24560.1</MicrosoftDotNetBuildTasksInstallersVersion>
169+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24560.1</MicrosoftDotNetBuildTasksTemplatingVersion>
170+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24560.1</MicrosoftDotNetRemoteExecutorVersion>
171+
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24560.1</MicrosoftSourceBuildIntermediatearcadeVersion>
172172
<!-- Packages from dotnet/source-build-externals -->
173-
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.0-alpha.1.24528.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
173+
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.0-alpha.1.24554.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
174174
<!-- Packages from dotnet/source-build-reference-packages -->
175-
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>10.0.0-alpha.1.24554.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
175+
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>10.0.0-alpha.1.24558.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
176176
<!-- Packages from dotnet/symreader -->
177177
<MicrosoftSourceBuildIntermediatesymreaderVersion>2.2.0-beta.24527.1</MicrosoftSourceBuildIntermediatesymreaderVersion>
178178
<!-- Packages from dotnet/xdt -->

‎eng/common/native/install-dependencies.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ case "$os" in
2424
apt update
2525

2626
apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
27-
libssl-dev libkrb5-dev zlib1g-dev pigz
27+
libssl-dev libkrb5-dev zlib1g-dev pigz cpio
2828

2929
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
3030
elif [ "$ID" = "fedora" ]; then
31-
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz
31+
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz cpio
3232
elif [ "$ID" = "alpine" ]; then
33-
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz
33+
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz cpio
3434
else
3535
echo "Unsupported distro. distro: $ID"
3636
exit 1

‎eng/common/tools.ps1‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -604,14 +604,7 @@ function InitializeBuildTool() {
604604
}
605605
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
606606

607-
# Use override if it exists - commonly set by source-build
608-
if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) {
609-
$initializeBuildToolFramework="net9.0"
610-
} else {
611-
$initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework
612-
}
613-
614-
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework }
607+
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net' }
615608
} elseif ($msbuildEngine -eq "vs") {
616609
try {
617610
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
@@ -620,7 +613,7 @@ function InitializeBuildTool() {
620613
ExitWithExitCode 1
621614
}
622615

623-
$buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472"; ExcludePrereleaseVS = $excludePrereleaseVS }
616+
$buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "netframework"; ExcludePrereleaseVS = $excludePrereleaseVS }
624617
} else {
625618
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unexpected value of -msbuildEngine: '$msbuildEngine'."
626619
ExitWithExitCode 1
@@ -779,8 +772,10 @@ function MSBuild() {
779772
# new scripts need to work with old packages, so we need to look for the old names/versions
780773
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')),
781774
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
782-
(Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.ArcadeLogging.dll')),
783-
(Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll')),
775+
776+
# This list doesn't need to be updated anymore and can eventually be removed.
777+
(Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.ArcadeLogging.dll')),
778+
(Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.Arcade.Sdk.dll')),
784779
(Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.ArcadeLogging.dll')),
785780
(Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
786781
)

‎eng/common/tools.sh‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -339,12 +339,6 @@ function InitializeBuildTool {
339339
# return values
340340
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
341341
_InitializeBuildToolCommand="msbuild"
342-
# use override if it exists - commonly set by source-build
343-
if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then
344-
_InitializeBuildToolFramework="net9.0"
345-
else
346-
_InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}"
347-
fi
348342
}
349343

350344
# Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116
@@ -454,10 +448,12 @@ function MSBuild {
454448
# new scripts need to work with old packages, so we need to look for the old names/versions
455449
local selectedPath=
456450
local possiblePaths=()
457-
possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.ArcadeLogging.dll" )
458-
possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" )
459-
possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.ArcadeLogging.dll" )
460-
possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.Arcade.Sdk.dll" )
451+
possiblePaths+=( "$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll" )
452+
possiblePaths+=( "$toolset_dir/net/Microsoft.DotNet.Arcade.Sdk.dll" )
453+
454+
# This list doesn't need to be updated anymore and can eventually be removed.
455+
possiblePaths+=( "$toolset_dir/net9.0/Microsoft.DotNet.ArcadeLogging.dll" )
456+
possiblePaths+=( "$toolset_dir/net9.0/Microsoft.DotNet.Arcade.Sdk.dll" )
461457
possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.ArcadeLogging.dll" )
462458
possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.Arcade.Sdk.dll" )
463459
for path in "${possiblePaths[@]}"; do

‎eng/helix/helix.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
<!-- Specify the .NET runtime we need which will be included as a correlation payload. -->
5353
<ItemGroup>
5454
<!--
55-
Use the BrowserDebugHost transport package as a sentinel for the non-shipping version of the NETCoreApp shared framework.
55+
Use the Microsoft.Internal.Runtime.AspNetCore.Transport transport package as a sentinel for the non-shipping version of the NETCoreApp shared framework.
5656
-->
57-
<AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
57+
<AdditionalDotNetPackage Include="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)">
5858
<PackageType>runtime</PackageType>
5959
</AdditionalDotNetPackage>
6060

0 commit comments

Comments
 (0)