From ac464072c7f6dcb680e303d8942333897ed96e2a Mon Sep 17 00:00:00 2001
From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com>
Date: Wed, 13 Dec 2023 21:02:11 -0800
Subject: [PATCH 1/7] Pass CrossBuild to inner builds
---
src/SourceBuild/content/repo-projects/Directory.Build.props | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props
index 266ebe7ce..4daaf1eb2 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.props
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.props
@@ -119,9 +119,6 @@
-
-
-
@@ -168,6 +165,7 @@
$(StandardSourceBuildArgs) /p:PreviouslySourceBuiltNupkgCacheDir="$(PrebuiltSourceBuiltPackagesPath)"
$(StandardSourceBuildArgs) /p:SourceBuildUseMonoRuntime=$(SourceBuildUseMonoRuntime)
$(StandardSourceBuildArgs) /p:DotNetBuildVertical=$(DotNetBuildVertical)
+ $(StandardSourceBuildArgs) /p:CrossBuild=$(CrossBuild)
$(ProjectDirectory)\build$(ShellExtension)
From afc2796202c6077872a32d05c4ddd41a433a40fe Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
Date: Thu, 14 Dec 2023 13:26:51 +0000
Subject: [PATCH 2/7] Update dependencies from https://github.com/dotnet/arcade
build 20231213.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks
From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23613.3
---
eng/Version.Details.xml | 16 ++++++++--------
eng/Versions.props | 2 +-
eng/common/templates/job/source-index-stage1.yml | 10 +++++-----
eng/common/tools.ps1 | 5 -----
eng/common/tools.sh | 5 -----
global.json | 4 ++--
6 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 09ccdc1f3..4b96bfa0d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -211,18 +211,18 @@
-
+
https://github.com/dotnet/arcade
- 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d
+ b6349a217d7e2f6b5c1831702f8beef5c171da3f
-
+
https://github.com/dotnet/arcade
- 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d
+ b6349a217d7e2f6b5c1831702f8beef5c171da3f
-
+
https://github.com/dotnet/arcade
- 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d
+ b6349a217d7e2f6b5c1831702f8beef5c171da3f
https://github.com/dotnet/arcade-services
@@ -232,9 +232,9 @@
https://github.com/dotnet/arcade-services
5263b603d90991a0c200aca8b8892c3d7cfe4751
-
+
https://github.com/dotnet/arcade
- 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d
+ b6349a217d7e2f6b5c1831702f8beef5c171da3f
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index b3a71de8a..6b1aa5833 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -40,7 +40,7 @@
- 9.0.0-beta.23612.2
+ 9.0.0-beta.23613.3
diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml
index b98202aa0..795233662 100644
--- a/eng/common/templates/job/source-index-stage1.yml
+++ b/eng/common/templates/job/source-index-stage1.yml
@@ -1,6 +1,6 @@
parameters:
runAsPublic: false
- sourceIndexPackageVersion: 1.0.1-20230228.2
+ sourceIndexPackageVersion: 1.0.1-20231213.4
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
preSteps: []
@@ -30,20 +30,20 @@ jobs:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: $(DncEngPublicBuildPool)
- demands: ImageOverride -equals windows.vs2019.amd64.open
+ demands: ImageOverride -equals windows.vs2022.amd64.open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $(DncEngInternalBuildPool)
- demands: ImageOverride -equals windows.vs2019.amd64
+ demands: ImageOverride -equals windows.vs2022.amd64
steps:
- ${{ each preStep in parameters.preSteps }}:
- ${{ preStep }}
- task: UseDotNet@2
- displayName: Use .NET Core SDK 6
+ displayName: Use .NET 8 SDK
inputs:
packageType: sdk
- version: 6.0.x
+ version: 8.0.x
installationPath: $(Agent.TempDirectory)/dotnet
workingDirectory: $(Agent.TempDirectory)
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 162dee2b9..540393a66 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -165,11 +165,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
}
- # Source Build uses DotNetCoreSdkDir variable
- if ($env:DotNetCoreSdkDir -ne $null) {
- $env:DOTNET_INSTALL_DIR = $env:DotNetCoreSdkDir
- }
-
# Find the first path on %PATH% that contains the dotnet.exe
if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) {
$dotnetExecutable = GetExecutableFileName 'dotnet'
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index e98daf50c..9e979ac16 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -123,11 +123,6 @@ function InitializeDotNetCli {
# so it doesn't output warnings to the console.
export LTTNG_HOME="$HOME"
- # Source Build uses DotNetCoreSdkDir variable
- if [[ -n "${DotNetCoreSdkDir:-}" ]]; then
- export DOTNET_INSTALL_DIR="$DotNetCoreSdkDir"
- fi
-
# Find the first path on $PATH that contains the dotnet.exe
if [[ "$use_installed_dotnet_cli" == true && $global_json_has_runtimes == false && -z "${DOTNET_INSTALL_DIR:-}" ]]; then
local dotnet_path=`command -v dotnet`
diff --git a/global.json b/global.json
index 5ad922d74..293535aae 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23612.2",
- "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23612.2"
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23613.3",
+ "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23613.3"
}
}
From 74bcdc33105f0ed78be3e1e27951b1958ad6b5a9 Mon Sep 17 00:00:00 2001
From: Matt Thalman
Date: Thu, 14 Dec 2023 08:35:43 -0600
Subject: [PATCH 3/7] Add templating patch to target net9.0 (#17952)
---
...Set-NETCoreTargetFramework-to-net9.0.patch | 23 +++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 src/SourceBuild/patches/templating/0001-Set-NETCoreTargetFramework-to-net9.0.patch
diff --git a/src/SourceBuild/patches/templating/0001-Set-NETCoreTargetFramework-to-net9.0.patch b/src/SourceBuild/patches/templating/0001-Set-NETCoreTargetFramework-to-net9.0.patch
new file mode 100644
index 000000000..f0d6531ee
--- /dev/null
+++ b/src/SourceBuild/patches/templating/0001-Set-NETCoreTargetFramework-to-net9.0.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Matt Thalman
+Date: Tue, 12 Dec 2023 10:49:01 -0600
+Subject: [PATCH] Set NETCoreTargetFramework to net9.0
+
+Backport: https://github.com/dotnet/source-build/issues/3663
+---
+ Directory.Build.props | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Directory.Build.props b/Directory.Build.props
+index 6370d08a9..7292506cd 100644
+--- a/Directory.Build.props
++++ b/Directory.Build.props
+@@ -5,7 +5,7 @@
+
+
+ preview
+- net8.0
++ net9.0
+ netstandard2.0
+ net48
+ Microsoft .NET Core
From 8ba0d7c60348e111014b099e0aeab03b71f7e4e6 Mon Sep 17 00:00:00 2001
From: Viktor Hofer
Date: Fri, 15 Dec 2023 00:04:33 +0100
Subject: [PATCH 4/7] Remove unused Microsoft.Build.CentralPackageVersions
(#17981)
---
src/SourceBuild/content/global.json | 1 -
.../content/repo-projects/msbuild.proj | 41 -------------------
2 files changed, 42 deletions(-)
diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json
index 8374e1deb..e9be1ae6f 100644
--- a/src/SourceBuild/content/global.json
+++ b/src/SourceBuild/content/global.json
@@ -3,7 +3,6 @@
"dotnet": "9.0.100-alpha.1.23603.1"
},
"msbuild-sdks": {
- "Microsoft.Build.CentralPackageVersions": "2.0.1",
"Microsoft.Build.Traversal": "2.0.2",
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27107-01",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21304.1",
diff --git a/src/SourceBuild/content/repo-projects/msbuild.proj b/src/SourceBuild/content/repo-projects/msbuild.proj
index 36c6ab7c0..249a91269 100644
--- a/src/SourceBuild/content/repo-projects/msbuild.proj
+++ b/src/SourceBuild/content/repo-projects/msbuild.proj
@@ -2,8 +2,6 @@
- $(OutputVersionArgs) /p:DisableNerdbankVersioning=true
-
true
$(StandardSourceBuildArgs)
$(BuildCommandArgs) $(FlagParameterPrefix)v $(LogVerbosity)
@@ -15,7 +13,6 @@
-
@@ -24,43 +21,5 @@
-
-
-
-
-
-
-
- <_CentralVersionsToolPackage
- Include="$(ReferencePackagesDir)%(CentralPackageVersionsSdkOverride.Identity)*.nupkg"
- Id="%(CentralPackageVersionsSdkOverride.Identity)" />
-
-
-
- $(SourceBuiltSdksDir)%(_CentralVersionsToolPackage.Id)/
-
-
-
-
-
-
-
-
-
-
From 25dcfe15b01029eab5ef6756117ac101231f55e7 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 15 Dec 2023 12:47:35 +0100
Subject: [PATCH 5/7] [main] Update dependencies from dotnet/arcade (#17985)
Co-authored-by: dotnet-maestro[bot]
Co-authored-by: Viktor Hofer
---
eng/Version.Details.xml | 16 +-
eng/Versions.props | 2 +-
eng/common/sdl/trim-assets-version.ps1 | 4 +-
eng/common/templates/steps/source-build.yml | 4 +-
eng/common/tools.ps1 | 24 +-
eng/common/tools.sh | 8 +-
global.json | 6 +-
.../repo-projects/Directory.Build.targets | 2 +-
...1-Use-net9.0-for-task-assembly-paths.patch | 232 ------------------
...02-Target-net9.0-for-arcade-projects.patch | 22 --
...e-NetCurrent-to-net9.0-in-Arcade-SDK.patch | 28 ---
11 files changed, 35 insertions(+), 313 deletions(-)
delete mode 100644 src/SourceBuild/patches/arcade/0001-Use-net9.0-for-task-assembly-paths.patch
delete mode 100644 src/SourceBuild/patches/arcade/0002-Target-net9.0-for-arcade-projects.patch
delete mode 100644 src/SourceBuild/patches/arcade/0003-Update-NetCurrent-to-net9.0-in-Arcade-SDK.patch
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4b96bfa0d..93aa3ec04 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -211,18 +211,18 @@
-
+
https://github.com/dotnet/arcade
- b6349a217d7e2f6b5c1831702f8beef5c171da3f
+ 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d
-
+
https://github.com/dotnet/arcade
- b6349a217d7e2f6b5c1831702f8beef5c171da3f
+ 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d
-
+
https://github.com/dotnet/arcade
- b6349a217d7e2f6b5c1831702f8beef5c171da3f
+ 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d
https://github.com/dotnet/arcade-services
@@ -232,9 +232,9 @@
https://github.com/dotnet/arcade-services
5263b603d90991a0c200aca8b8892c3d7cfe4751
-
+
https://github.com/dotnet/arcade
- b6349a217d7e2f6b5c1831702f8beef5c171da3f
+ 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 6b1aa5833..b0844a215 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -40,7 +40,7 @@
- 9.0.0-beta.23613.3
+ 9.0.0-beta.23614.6
diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1
index a2e004877..1f3c531b2 100644
--- a/eng/common/sdl/trim-assets-version.ps1
+++ b/eng/common/sdl/trim-assets-version.ps1
@@ -61,6 +61,8 @@ try {
ExitWithExitCode 1
}
+ # Remove the ROLL FORWARD env var with a future Arcade.Sdk update in Arcade.
+ $env:DOTNET_ROLL_FORWARD = "Major"
Exec-BlockVerbosely {
& "$dotnet" $CliToolName trim-assets-version `
--assets-path $InputPath `
@@ -72,4 +74,4 @@ catch {
Write-Host $_
Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
ExitWithExitCode 1
-}
\ No newline at end of file
+}
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index 41bbb9157..1d7979736 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -105,7 +105,7 @@ steps:
Contents: |
**/*.log
**/*.binlog
- artifacts/source-build/self/prebuilt-report/**
+ artifacts/sb/prebuilt-report/**
TargetFolder: '$(Build.StagingDirectory)/BuildLogs'
CleanTargetFolder: true
continueOnError: true
@@ -126,4 +126,4 @@ steps:
- task: ComponentGovernanceComponentDetection@0
displayName: Component Detection (Exclude upstream cache)
inputs:
- ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache'
+ ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 540393a66..9048d6032 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -596,7 +596,7 @@ function InitializeBuildTool() {
ExitWithExitCode 1
}
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
- $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' }
+ $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net9.0' }
} elseif ($msbuildEngine -eq "vs") {
try {
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
@@ -671,8 +671,14 @@ function Read-ArcadeSdkVersion() {
}
function InitializeToolset() {
- if (Test-Path variable:global:_ToolsetBuildProj) {
- return $global:_ToolsetBuildProj
+ # For Unified Build/Source-build support, check whether the environment variable is
+ # set. If it is, then use this as the toolset build project.
+ if ($env:_InitializeToolset -ne $null) {
+ return $global:_InitializeToolset = $env:_InitializeToolset
+ }
+
+ if (Test-Path variable:global:_InitializeToolset) {
+ return $global:_InitializeToolset
}
$nugetCache = GetNuGetPackageCachePath
@@ -683,7 +689,7 @@ function InitializeToolset() {
if (Test-Path $toolsetLocationFile) {
$path = Get-Content $toolsetLocationFile -TotalCount 1
if (Test-Path $path) {
- return $global:_ToolsetBuildProj = $path
+ return $global:_InitializeToolset = $path
}
}
@@ -706,7 +712,7 @@ function InitializeToolset() {
throw "Invalid toolset path: $path"
}
- return $global:_ToolsetBuildProj = $path
+ return $global:_InitializeToolset = $path
}
function ExitWithExitCode([int] $exitCode) {
@@ -758,12 +764,10 @@ function MSBuild() {
# new scripts need to work with old packages, so we need to look for the old names/versions
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')),
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
- (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.ArcadeLogging.dll')),
- (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
- (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')),
- (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
(Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.ArcadeLogging.dll')),
- (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
+ (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll')),
+ (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.ArcadeLogging.dll')),
+ (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
)
$selectedPath = $null
foreach ($path in $possiblePaths) {
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 9e979ac16..ece4b7307 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -338,7 +338,7 @@ function InitializeBuildTool {
_InitializeBuildToolCommand="msbuild"
# use override if it exists - commonly set by source-build
if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then
- _InitializeBuildToolFramework="net8.0"
+ _InitializeBuildToolFramework="net9.0"
else
_InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}"
fi
@@ -453,12 +453,10 @@ function MSBuild {
local possiblePaths=()
possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.ArcadeLogging.dll" )
possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" )
- possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.ArcadeLogging.dll" )
- possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
- possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" )
- possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" )
possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.ArcadeLogging.dll" )
possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.Arcade.Sdk.dll" )
+ possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.ArcadeLogging.dll" )
+ possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.Arcade.Sdk.dll" )
for path in "${possiblePaths[@]}"; do
if [[ -f $path ]]; then
selectedPath=$path
diff --git a/global.json b/global.json
index 293535aae..88ad3b49e 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "9.0.100-alpha.1.23524.3",
+ "dotnet": "9.0.100-alpha.1.23613.1",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
@@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23613.3",
- "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23613.3"
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23614.6",
+ "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23614.6"
}
}
diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 07aefc4d8..7e4d04284 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -320,7 +320,7 @@
- <_InnerPackageCacheFiles Include="$(ProjectDirectory)artifacts/source-build/self/package-cache/**/*" />
+ <_InnerPackageCacheFiles Include="$(ProjectDirectory)artifacts/sb/package-cache/**/*" />
-Date: Thu, 16 Nov 2023 14:42:59 -0600
-Subject: [PATCH] Use net9.0 for task assembly paths
-
-Backport: https://github.com/dotnet/source-build/issues/3743
----
- .../tools/BuildReleasePackages.targets | 2 +-
- src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props | 2 +-
- .../build/Microsoft.DotNet.Build.Tasks.Installers.props | 2 +-
- .../src/build/Packaging.common.targets | 2 +-
- .../build/Microsoft.DotNet.Build.Tasks.TargetFramework.props | 2 +-
- .../src/build/Microsoft.DotNet.Build.Tasks.Workloads.props | 2 +-
- .../build/Microsoft.DotNet.Deployment.Tasks.Links.props | 2 +-
- .../build/Microsoft.DotNet.GenFacades.targets | 2 +-
- .../Sdk/tools/Microsoft.DotNet.Helix.Sdk.props | 2 +-
- .../build/Microsoft.DotNet.PackageTesting.props | 2 +-
- src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props | 2 +-
- .../build/Microsoft.DotNet.SignTool.props | 2 +-
- .../tasks/build/Microsoft.DotNet.SourceBuild.Tasks.props | 2 +-
- .../build/Microsoft.DotNet.SwaggerGenerator.MSBuild.props | 2 +-
- .../src/build/Microsoft.DotNet.XUnitConsoleRunner.props | 2 +-
- .../build/Microsoft.DotNet.XliffTasks.targets | 2 +-
- 16 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildReleasePackages.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildReleasePackages.targets
-index af86865d..751a79c4 100644
---- a/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildReleasePackages.targets
-+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildReleasePackages.targets
-@@ -2,7 +2,7 @@
-
-
- <_NuGetRepackAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(NuGetPackageRoot)microsoft.dotnet.nugetrepack.tasks\$(MicrosoftDotnetNuGetRepackTasksVersion)\tools\net472\Microsoft.DotNet.NuGetRepack.Tasks.dll
-- <_NuGetRepackAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)microsoft.dotnet.nugetrepack.tasks\$(MicrosoftDotnetNuGetRepackTasksVersion)\tools\net8.0\Microsoft.DotNet.NuGetRepack.Tasks.dll
-+ <_NuGetRepackAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)microsoft.dotnet.nugetrepack.tasks\$(MicrosoftDotnetNuGetRepackTasksVersion)\tools\net9.0\Microsoft.DotNet.NuGetRepack.Tasks.dll
-
-
-
-diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props
-index 39214fef..74755a09 100644
---- a/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props
-+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props
-@@ -2,6 +2,6 @@
-
-
- $(MSBuildThisFileDirectory)net472\Microsoft.DotNet.Arcade.Sdk.dll
-- $(MSBuildThisFileDirectory)net8.0\Microsoft.DotNet.Arcade.Sdk.dll
-+ $(MSBuildThisFileDirectory)net9.0\Microsoft.DotNet.Arcade.Sdk.dll
-
-
-diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.props b/src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.props
-index a7910488..6a8895b5 100644
---- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.props
-+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.props
-@@ -2,7 +2,7 @@
-
-
-
-- $(MSBuildThisFileDirectory)..\tools\net8.0\Microsoft.DotNet.Build.Tasks.Installers.dll
-+ $(MSBuildThisFileDirectory)..\tools\net9.0\Microsoft.DotNet.Build.Tasks.Installers.dll
- $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.Build.Tasks.Installers.dll
- $(MSBuildThisFileDirectory)
-
-diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.common.targets b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.common.targets
-index 99b1d490..4ae4de45 100644
---- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.common.targets
-+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.common.targets
-@@ -4,7 +4,7 @@
-
-
-
-- $(MSBuildThisFileDirectory)../tools/net8.0/
-+ $(MSBuildThisFileDirectory)../tools/net9.0/
- $(MSBuildThisFileDirectory)../tools/net472/
- $(MSBuildThisFileDirectory)runtime.json
-
-diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.props b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.props
-index 9712b0ad..801ec5cd 100644
---- a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.props
-+++ b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.props
-@@ -1,7 +1,7 @@
-
-
-
-- ..\tools\net8.0\Microsoft.DotNet.Build.Tasks.TargetFramework.dll
-+ ..\tools\net9.0\Microsoft.DotNet.Build.Tasks.TargetFramework.dll
- ..\tools\net472\Microsoft.DotNet.Build.Tasks.TargetFramework.dll
-
-
-diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/build/Microsoft.DotNet.Build.Tasks.Workloads.props b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/build/Microsoft.DotNet.Build.Tasks.Workloads.props
-index b7e95130..900fdb47 100644
---- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/build/Microsoft.DotNet.Build.Tasks.Workloads.props
-+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/build/Microsoft.DotNet.Build.Tasks.Workloads.props
-@@ -2,7 +2,7 @@
-
-
-
-- $(MSBuildThisFileDirectory)..\tools\net8.0\Microsoft.DotNet.Build.Tasks.Workloads.dll
-+ $(MSBuildThisFileDirectory)..\tools\net9.0\Microsoft.DotNet.Build.Tasks.Workloads.dll
- $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.Build.Tasks.Workloads.dll
-
-
-diff --git a/src/Microsoft.DotNet.Deployment.Tasks.Links/build/Microsoft.DotNet.Deployment.Tasks.Links.props b/src/Microsoft.DotNet.Deployment.Tasks.Links/build/Microsoft.DotNet.Deployment.Tasks.Links.props
-index 3ff65b8c..dcc23986 100644
---- a/src/Microsoft.DotNet.Deployment.Tasks.Links/build/Microsoft.DotNet.Deployment.Tasks.Links.props
-+++ b/src/Microsoft.DotNet.Deployment.Tasks.Links/build/Microsoft.DotNet.Deployment.Tasks.Links.props
-@@ -2,7 +2,7 @@
-
-
-
-- $(MSBuildThisFileDirectory)net8.0\Microsoft.DotNet.Deployment.Tasks.Links.dll
-+ $(MSBuildThisFileDirectory)net9.0\Microsoft.DotNet.Deployment.Tasks.Links.dll
- $(MSBuildThisFileDirectory)net472\Microsoft.DotNet.Deployment.Tasks.Links.dll
-
-
-diff --git a/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacades.targets b/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacades.targets
-index 65045a3a..98f22ef3 100644
---- a/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacades.targets
-+++ b/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacades.targets
-@@ -2,7 +2,7 @@
-
-
-
-- $(MSBuildThisFileDirectory)..\tools\net8.0\Microsoft.DotNet.GenFacades.dll
-+ $(MSBuildThisFileDirectory)..\tools\net9.0\Microsoft.DotNet.GenFacades.dll
- $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.GenFacades.dll
-
-
-diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props b/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props
-index 1c51c182..ec91afae 100644
---- a/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props
-+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props
-@@ -4,7 +4,7 @@
-
-
-
-- $(MSBuildThisFileDirectory)net8.0/Microsoft.DotNet.Helix.Sdk.dll
-+ $(MSBuildThisFileDirectory)net9.0/Microsoft.DotNet.Helix.Sdk.dll
- $(MSBuildThisFileDirectory)net472/Microsoft.DotNet.Helix.Sdk.dll
-
-
-diff --git a/src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props b/src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props
-index 82850655..394ed5cc 100644
---- a/src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props
-+++ b/src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props
-@@ -3,7 +3,7 @@
-
-
- $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.PackageTesting.dll
-- $(MSBuildThisFileDirectory)..\tools\net8.0\Microsoft.DotNet.PackageTesting.dll
-+ $(MSBuildThisFileDirectory)..\tools\net9.0\Microsoft.DotNet.PackageTesting.dll
-
-
-
-diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props b/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props
-index 44951b96..77176b15 100644
---- a/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props
-+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props
-@@ -9,7 +9,7 @@
- -->
-
-
-- $(MSBuildThisFileDirectory)../tools/net8.0/
-+ $(MSBuildThisFileDirectory)../tools/net9.0/
- $(MSBuildThisFileDirectory)../tools/net472/
-
-
-diff --git a/src/Microsoft.DotNet.SignTool/build/Microsoft.DotNet.SignTool.props b/src/Microsoft.DotNet.SignTool/build/Microsoft.DotNet.SignTool.props
-index 369cb60a..3522d8c5 100644
---- a/src/Microsoft.DotNet.SignTool/build/Microsoft.DotNet.SignTool.props
-+++ b/src/Microsoft.DotNet.SignTool/build/Microsoft.DotNet.SignTool.props
-@@ -2,7 +2,7 @@
-
-
-
-- $(MSBuildThisFileDirectory)..\lib\net8.0\Microsoft.DotNet.SignTool.dll
-+ $(MSBuildThisFileDirectory)..\lib\net9.0\Microsoft.DotNet.SignTool.dll
- $(MSBuildThisFileDirectory)..\lib\net472\Microsoft.DotNet.SignTool.dll
-
-
-diff --git a/src/Microsoft.DotNet.SourceBuild/tasks/build/Microsoft.DotNet.SourceBuild.Tasks.props b/src/Microsoft.DotNet.SourceBuild/tasks/build/Microsoft.DotNet.SourceBuild.Tasks.props
-index 9dc4c6cc..a49ee2b6 100644
---- a/src/Microsoft.DotNet.SourceBuild/tasks/build/Microsoft.DotNet.SourceBuild.Tasks.props
-+++ b/src/Microsoft.DotNet.SourceBuild/tasks/build/Microsoft.DotNet.SourceBuild.Tasks.props
-@@ -2,7 +2,7 @@
-
-
-
-- $(MSBuildThisFileDirectory)..\tools\net8.0\$(MSBuildThisFileName).dll
-+ $(MSBuildThisFileDirectory)..\tools\net9.0\$(MSBuildThisFileName).dll
- $(MSBuildThisFileDirectory)..\tools\net472\$(MSBuildThisFileName).dll
-
-
-diff --git a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.props b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.props
-index 5362d800..1ae4e21c 100644
---- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.props
-+++ b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.props
-@@ -2,7 +2,7 @@
-
-
-
-- $(MSBuildThisFileDirectory)../tools/net8.0/Microsoft.DotNet.SwaggerGenerator.MSBuild.dll
-+ $(MSBuildThisFileDirectory)../tools/net9.0/Microsoft.DotNet.SwaggerGenerator.MSBuild.dll
- $(MSBuildThisFileDirectory)../tools/net472/Microsoft.DotNet.SwaggerGenerator.MSBuild.dll
-
-
-diff --git a/src/Microsoft.DotNet.XUnitConsoleRunner/src/build/Microsoft.DotNet.XUnitConsoleRunner.props b/src/Microsoft.DotNet.XUnitConsoleRunner/src/build/Microsoft.DotNet.XUnitConsoleRunner.props
-index 09142a05..0af5cf87 100644
---- a/src/Microsoft.DotNet.XUnitConsoleRunner/src/build/Microsoft.DotNet.XUnitConsoleRunner.props
-+++ b/src/Microsoft.DotNet.XUnitConsoleRunner/src/build/Microsoft.DotNet.XUnitConsoleRunner.props
-@@ -2,7 +2,7 @@
-
-
-
-- $(MSBuildThisFileDirectory)..\tools\net8.0\xunit.console.dll
-+ $(MSBuildThisFileDirectory)..\tools\net9.0\xunit.console.dll
-
-
-
-diff --git a/src/Microsoft.DotNet.XliffTasks/build/Microsoft.DotNet.XliffTasks.targets b/src/Microsoft.DotNet.XliffTasks/build/Microsoft.DotNet.XliffTasks.targets
-index 2bce08cd..d45f1cb2 100644
---- a/src/Microsoft.DotNet.XliffTasks/build/Microsoft.DotNet.XliffTasks.targets
-+++ b/src/Microsoft.DotNet.XliffTasks/build/Microsoft.DotNet.XliffTasks.targets
-@@ -2,7 +2,7 @@
-
-
-
-- $(MSBuildThisFileDirectory)..\tools\net8.0\
-+ $(MSBuildThisFileDirectory)..\tools\net9.0\
- $(MSBuildThisFileDirectory)..\tools\net472\
- $(XliffTasksDirectory)Microsoft.DotNet.XliffTasks.dll
-
diff --git a/src/SourceBuild/patches/arcade/0002-Target-net9.0-for-arcade-projects.patch b/src/SourceBuild/patches/arcade/0002-Target-net9.0-for-arcade-projects.patch
deleted file mode 100644
index 9dd18d1c6..000000000
--- a/src/SourceBuild/patches/arcade/0002-Target-net9.0-for-arcade-projects.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Matt Thalman
-Date: Thu, 16 Nov 2023 14:48:18 -0600
-Subject: [PATCH] Target net9.0 for arcade projects
-
-Backport: https://github.com/dotnet/source-build/issues/3743
----
- Directory.Build.props | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Directory.Build.props b/Directory.Build.props
-index 32befcfc..2285cc5d 100644
---- a/Directory.Build.props
-+++ b/Directory.Build.props
-@@ -9,6 +9,7 @@
- embedded
- true
- Latest
-+ net9.0
-
-
-- net8.0
-+ net9.0
-
-
-- net7.0
-+ net8.0
-
-
From 0b5c084524a48200d9515067143c95d3d16d4012 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 15 Dec 2023 16:45:23 +0000
Subject: [PATCH 6/7] [main] Update dependencies from dotnet/sdk (#17970)
Co-authored-by: dotnet-maestro[bot]
Co-authored-by: Matt Thalman
---
eng/Version.Details.xml | 116 +++++++++---------
eng/Versions.props | 48 ++++----
.../0002-Update-MSBuild-ref-dependency.patch | 23 ----
3 files changed, 82 insertions(+), 105 deletions(-)
delete mode 100644 src/SourceBuild/patches/roslyn/0002-Update-MSBuild-ref-dependency.patch
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 93aa3ec04..4087eb5ff 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -5,42 +5,42 @@
Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos.
The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal.
-->
-
+
https://github.com/dotnet/windowsdesktop
- 696e213652005495ed7a103839772d1c249df7db
+ 24d29943d978beb39cabb14d63a9954d61826e97
-
+
https://github.com/dotnet/windowsdesktop
- 696e213652005495ed7a103839772d1c249df7db
+ 24d29943d978beb39cabb14d63a9954d61826e97
-
+
https://github.com/dotnet/windowsdesktop
- 696e213652005495ed7a103839772d1c249df7db
+ 24d29943d978beb39cabb14d63a9954d61826e97
-
+
https://github.com/dotnet/windowsdesktop
- 696e213652005495ed7a103839772d1c249df7db
+ 24d29943d978beb39cabb14d63a9954d61826e97
-
+
https://github.com/dotnet/runtime
- ab1a8224cdf115b65e0db5dc88d11f205068f444
+ 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428
-
+
https://github.com/dotnet/runtime
- ab1a8224cdf115b65e0db5dc88d11f205068f444
+ 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428
-
+
https://github.com/dotnet/runtime
- ab1a8224cdf115b65e0db5dc88d11f205068f444
+ 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428
-
+
https://github.com/dotnet/runtime
- ab1a8224cdf115b65e0db5dc88d11f205068f444
+ 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428
-
+
https://github.com/dotnet/runtime
- ab1a8224cdf115b65e0db5dc88d11f205068f444
+ 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428
@@ -48,55 +48,55 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://github.com/dotnet/runtime
- ab1a8224cdf115b65e0db5dc88d11f205068f444
+ 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428
-
+
https://github.com/dotnet/aspnetcore
- 15194b0a34157cdaf7c0e6e0813929aff2356986
+ 5088789413c6364dccd0f36b3eddc89c4606c42f
-
+
https://github.com/dotnet/aspnetcore
- 15194b0a34157cdaf7c0e6e0813929aff2356986
+ 5088789413c6364dccd0f36b3eddc89c4606c42f
-
+
https://github.com/dotnet/aspnetcore
- 15194b0a34157cdaf7c0e6e0813929aff2356986
+ 5088789413c6364dccd0f36b3eddc89c4606c42f
-
+
https://github.com/dotnet/aspnetcore
- 15194b0a34157cdaf7c0e6e0813929aff2356986
+ 5088789413c6364dccd0f36b3eddc89c4606c42f
-
+
https://github.com/dotnet/aspnetcore
- 15194b0a34157cdaf7c0e6e0813929aff2356986
+ 5088789413c6364dccd0f36b3eddc89c4606c42f
-
+
https://github.com/dotnet/aspnetcore
- 15194b0a34157cdaf7c0e6e0813929aff2356986
+ 5088789413c6364dccd0f36b3eddc89c4606c42f
-
+
https://github.com/dotnet/aspnetcore
- 15194b0a34157cdaf7c0e6e0813929aff2356986
+ 5088789413c6364dccd0f36b3eddc89c4606c42f
-
+
https://github.com/dotnet/sdk
- bc9da06d9512a3db932bf638cab8f8e3f5b5aea9
+ af41d3d39a69c7a17b6a3ae22259056100f23f6d
-
+
https://github.com/dotnet/sdk
- bc9da06d9512a3db932bf638cab8f8e3f5b5aea9
+ af41d3d39a69c7a17b6a3ae22259056100f23f6d
-
+
https://github.com/dotnet/sdk
- bc9da06d9512a3db932bf638cab8f8e3f5b5aea9
+ af41d3d39a69c7a17b6a3ae22259056100f23f6d
-
+
https://github.com/dotnet/sdk
- bc9da06d9512a3db932bf638cab8f8e3f5b5aea9
+ af41d3d39a69c7a17b6a3ae22259056100f23f6d
https://github.com/dotnet/test-templates
@@ -132,46 +132,46 @@
https://github.com/dotnet/wpf
8e3e1a550c591a7732df79f075716b88af692b43
-
+
https://github.com/dotnet/fsharp
- bb832169d6b799a62962452212010e66c3fecacf
+ 2aefcec87bf9e73a712c0c3f5b49c23358b034e8
-
+
https://github.com/dotnet/fsharp
- bb832169d6b799a62962452212010e66c3fecacf
+ 2aefcec87bf9e73a712c0c3f5b49c23358b034e8
-
+
https://github.com/microsoft/vstest
- 50c0f7889fdd8d13381d325bdbb6d253e33da1ff
+ dc8fe3865011cef3a0891f5f55c1fc5c7f401066
-
+
https://github.com/dotnet/runtime
- ab1a8224cdf115b65e0db5dc88d11f205068f444
+ 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428
-
+
https://github.com/dotnet/roslyn
- 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1
+ 462e180642875c0540ae1379e60425f635ec4f78
-
+
https://github.com/dotnet/msbuild
- 2f3d37672a69142a13a62856b09034a915bedc70
+ f97064d3b83485628dec0769659e786b55f6835a
-
+
https://github.com/nuget/nuget.client
- 400ac5960800c110213fe2a6069e40879f2d8fbe
+ e8b43e6602749844de42f9f37e07fa9aa1fb108c
https://github.com/Microsoft/ApplicationInsights-dotnet
53b80940842204f78708a538628288ff5d741a1d
-
+
https://github.com/dotnet/emsdk
- f0e25ac1b9cf1df8bbe6e873993ad74ce3ca8d26
+ 487a0a43dbe6e83f07b200b7523447222bb2137b
diff --git a/eng/Versions.props b/eng/Versions.props
index b0844a215..4ae3963b4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -73,50 +73,50 @@
- 9.0.0-alpha.1.23612.5
- 9.0.0-alpha.1.23612.5
- 9.0.0-alpha.1.23612.5
- 9.0.0-alpha.1.23612.5
- 9.0.0-alpha.1.23612.5
- 9.0.0-alpha.1.23612.5
- 9.0.0-alpha.1.23612.5
+ 9.0.0-alpha.1.23614.6
+ 9.0.0-alpha.1.23614.6
+ 9.0.0-alpha.1.23614.6
+ 9.0.0-alpha.1.23614.6
+ 9.0.0-alpha.1.23614.6
+ 9.0.0-alpha.1.23614.6
+ 9.0.0-alpha.1.23614.6
0.2.0
- 9.0.100-alpha.1.23613.6
- 9.0.100-alpha.1.23613.6
- 9.0.100-alpha.1.23613.6
+ 9.0.100-alpha.1.23615.3
+ 9.0.100-alpha.1.23615.3
+ 9.0.100-alpha.1.23615.3
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 4.9.0-3.23612.11
+ 4.9.0-3.23614.9
- 9.0.0-alpha.1.23612.13
+ 9.0.0-alpha.1.23614.10
- 9.0.0-alpha.1.23612.13
- 9.0.0-alpha.1.23612.13
- 9.0.0-alpha.1.23612.13
- 9.0.0-alpha.1.23612.13
- 9.0.0-alpha.1.23612.13
+ 9.0.0-alpha.1.23614.10
+ 9.0.0-alpha.1.23614.10
+ 9.0.0-alpha.1.23614.10
+ 9.0.0-alpha.1.23614.10
+ 9.0.0-alpha.1.23614.10
8.0.0-rc.1.23414.4
2.1.0
- 9.0.0-alpha.1.23612.1
- 9.0.0-alpha.1.23612.1
- 9.0.0-alpha.1.23612.1
- 9.0.0-alpha.1.23612.1
+ 9.0.0-alpha.1.23613.1
+ 9.0.0-alpha.1.23613.1
+ 9.0.0-alpha.1.23613.1
+ 9.0.0-alpha.1.23613.1
@@ -128,7 +128,7 @@
- 6.9.0-preview.1.52
+ 6.9.0-preview.1.54
@@ -246,7 +246,7 @@
2.2.0-beta.19072.10
2.0.0
- 17.9.0-preview-23610-02
+ 17.9.0-preview-23612-01
8.0.0-alpha.1.22557.12
9.0.0-preview.23613.1
@@ -262,7 +262,7 @@
13.3.8825-net8-rc1
16.4.8825-net8-rc1
- 9.0.0-alpha.1.23611.2
+ 9.0.0-alpha.1.23613.1
$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)
9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))
diff --git a/src/SourceBuild/patches/roslyn/0002-Update-MSBuild-ref-dependency.patch b/src/SourceBuild/patches/roslyn/0002-Update-MSBuild-ref-dependency.patch
deleted file mode 100644
index 631903885..000000000
--- a/src/SourceBuild/patches/roslyn/0002-Update-MSBuild-ref-dependency.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Matt Thalman
-Date: Mon, 4 Dec 2023 11:03:10 -0600
-Subject: [PATCH] Update MSBuild ref dependency
-
-Backport: https://github.com/dotnet/roslyn/pull/71069
----
- eng/Versions.props | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/eng/Versions.props b/eng/Versions.props
-index 618bcbcbe5b..cc204cbb20c 100644
---- a/eng/Versions.props
-+++ b/eng/Versions.props
-@@ -32,7 +32,7 @@
- 17.8.9-preview
- 17.8.36711
-
-- 16.10.0
-+ 17.3.2
-
- 17.5.0
-