From 21360da20e55bfc279b1f1fd9340cd46cadc63e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Jan 2024 03:22:20 +0000 Subject: [PATCH 1/9] Update dependencies from https://github.com/dotnet/sdk build 20240129.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.1.24078.3 -> To Version 9.0.100-preview.1.24079.4 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.300-beta.24075.4 -> To Version 12.8.300-beta.24079.8 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7faecf73d8d7..a7754c612827 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 - + https://github.com/dotnet/sdk - a5ff667ac7e3b36ad1aeda2d13ff6fcbb165a19d + b1d985751d08556f9f003875f5250b1100680e73 - + https://github.com/dotnet/sdk - a5ff667ac7e3b36ad1aeda2d13ff6fcbb165a19d + b1d985751d08556f9f003875f5250b1100680e73 - + https://github.com/dotnet/sdk - a5ff667ac7e3b36ad1aeda2d13ff6fcbb165a19d + b1d985751d08556f9f003875f5250b1100680e73 - + https://github.com/dotnet/sdk - a5ff667ac7e3b36ad1aeda2d13ff6fcbb165a19d + b1d985751d08556f9f003875f5250b1100680e73 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://github.com/dotnet/wpf 1aac60e5b2b5021a035fb657cb108f438a0d322d - + https://github.com/dotnet/fsharp - 32898dc51efc669de98e7e47f57d521bc07ac4cc + 7c217c487c6e2b7d824f3d40666b3cbad412cad4 - + https://github.com/dotnet/fsharp - 32898dc51efc669de98e7e47f57d521bc07ac4cc + 7c217c487c6e2b7d824f3d40666b3cbad412cad4 diff --git a/eng/Versions.props b/eng/Versions.props index 3cae382957cf..a60856b7b6c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-preview.1.24078.3 - 9.0.100-preview.1.24078.3 - 9.0.100-preview.1.24078.3 + 9.0.100-preview.1.24079.4 + 9.0.100-preview.1.24079.4 + 9.0.100-preview.1.24079.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1e505cd3171bc93bc612124d72566a9973b49c28 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 30 Jan 2024 08:40:53 -0600 Subject: [PATCH 2/9] Rebase fsharp patch --- .../fsharp/0001-Explicitly-set-net9.0-TFM.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch b/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch index 18a132e6fd86..ae3b5241eaaa 100644 --- a/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch +++ b/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch @@ -43,10 +43,10 @@ Backport: https://github.com/dotnet/source-build/issues/3663 35 files changed, 82 insertions(+), 73 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props -index 10c539090..824602dcb 100644 +index 0fe610fc2..019d01d14 100644 --- a/Directory.Build.props +++ b/Directory.Build.props -@@ -34,8 +34,8 @@ +@@ -36,8 +36,8 @@ $(MSBuildThisFileDirectory)artifacts/ $(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/ $(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/ @@ -522,7 +522,7 @@ index 9706167ff..e02746a8e 100644 true diff --git a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj -index 13add7032..4bbae272f 100644 +index fe6d95f90..9f81af284 100644 --- a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj +++ b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj @@ -1,7 +1,7 @@ @@ -533,9 +533,9 @@ index 13add7032..4bbae272f 100644 + net9.0 true HistoricalBenchmark.Utilities - + $(NoWarn);NETSDK1206 diff --git a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj -index 2534ba292..feef2eaf7 100644 +index 09ca5cb69..575bb32a3 100644 --- a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj +++ b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj @@ -2,7 +2,7 @@ @@ -548,7 +548,7 @@ index 2534ba292..feef2eaf7 100644 Release diff --git a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj -index 55968eddd..e62ac8b85 100644 +index 043de02d3..d10a33cb6 100644 --- a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj +++ b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj @@ -2,7 +2,7 @@ @@ -561,7 +561,7 @@ index 55968eddd..e62ac8b85 100644 false diff --git a/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj b/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj -index 3774aa870..03c11414e 100644 +index 92255adb4..e2f32b3ee 100644 --- a/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj +++ b/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj @@ -2,7 +2,7 @@ From 32afda453ad91d7d901428f59413c2c7c55536ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Jan 2024 22:30:25 +0000 Subject: [PATCH 3/9] Update dependencies from https://github.com/dotnet/sdk build 20240130.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.1.24078.3 -> To Version 9.0.100-preview.1.24080.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk From Version 12.8.300-beta.24075.4 -> To Version 12.8.300-beta.24079.8 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7754c612827..856b640b0eab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 - + https://github.com/dotnet/sdk - b1d985751d08556f9f003875f5250b1100680e73 + 029e25e4f76a85af60db3a481e757c0ab1b8b3b0 - + https://github.com/dotnet/sdk - b1d985751d08556f9f003875f5250b1100680e73 + 029e25e4f76a85af60db3a481e757c0ab1b8b3b0 - + https://github.com/dotnet/sdk - b1d985751d08556f9f003875f5250b1100680e73 + 029e25e4f76a85af60db3a481e757c0ab1b8b3b0 - + https://github.com/dotnet/sdk - b1d985751d08556f9f003875f5250b1100680e73 + 029e25e4f76a85af60db3a481e757c0ab1b8b3b0 https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ 7c217c487c6e2b7d824f3d40666b3cbad412cad4 - + https://github.com/microsoft/vstest - 53df73d3373e7964f6fb37f4437bda2720a75ef2 + d61759559535f43790211fa53be7829dfe598841 diff --git a/eng/Versions.props b/eng/Versions.props index a60856b7b6c2..d74a671c9703 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-preview.1.24079.4 - 9.0.100-preview.1.24079.4 - 9.0.100-preview.1.24079.4 + 9.0.100-preview.1.24080.9 + 9.0.100-preview.1.24080.9 + 9.0.100-preview.1.24080.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -245,7 +245,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24069-04 + 17.10.0-preview-24080-01 9.0.0-alpha.1.24058.10 9.0.0-preview.24057.2 From 4434a8314f614790e44141b3c146b4870121c738 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Jan 2024 03:27:01 +0000 Subject: [PATCH 4/9] Update dependencies from https://github.com/dotnet/sdk build 20240130.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.1.24078.3 -> To Version 9.0.100-preview.1.24080.16 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk From Version 12.8.300-beta.24075.4 -> To Version 12.8.300-beta.24080.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 856b640b0eab..5a7d0f0051ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 - + https://github.com/dotnet/sdk - 029e25e4f76a85af60db3a481e757c0ab1b8b3b0 + e930166ebdf8b0ceb52a0fc066401cbb8c55dd49 - + https://github.com/dotnet/sdk - 029e25e4f76a85af60db3a481e757c0ab1b8b3b0 + e930166ebdf8b0ceb52a0fc066401cbb8c55dd49 - + https://github.com/dotnet/sdk - 029e25e4f76a85af60db3a481e757c0ab1b8b3b0 + e930166ebdf8b0ceb52a0fc066401cbb8c55dd49 - + https://github.com/dotnet/sdk - 029e25e4f76a85af60db3a481e757c0ab1b8b3b0 + e930166ebdf8b0ceb52a0fc066401cbb8c55dd49 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://github.com/dotnet/wpf 1aac60e5b2b5021a035fb657cb108f438a0d322d - + https://github.com/dotnet/fsharp - 7c217c487c6e2b7d824f3d40666b3cbad412cad4 + 80003bb3f0516455a0046887aa169febf2c4d3a8 - + https://github.com/dotnet/fsharp - 7c217c487c6e2b7d824f3d40666b3cbad412cad4 + 80003bb3f0516455a0046887aa169febf2c4d3a8 diff --git a/eng/Versions.props b/eng/Versions.props index d74a671c9703..37f479e2bbf5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-preview.1.24080.9 - 9.0.100-preview.1.24080.9 - 9.0.100-preview.1.24080.9 + 9.0.100-preview.1.24080.16 + 9.0.100-preview.1.24080.16 + 9.0.100-preview.1.24080.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9c5501482c6659781fc3765c144aade126ac32e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Jan 2024 05:48:12 +0000 Subject: [PATCH 5/9] Update dependencies from https://github.com/dotnet/sdk build 20240130.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.1.24078.3 -> To Version 9.0.100-preview.1.24080.19 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-preview.1.24074.8 -> To Version 9.0.0-preview.1.24080.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a7d0f0051ac..53534445a918 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 85b4932a31a185105303259e70347309c5d1e39d - + https://github.com/dotnet/runtime - b4aa81d9da52616ac18e6eb584e37a08cfb2ba87 + 4d8029314e75924cfa7be07439bca08f0c9f3403 - + https://github.com/dotnet/runtime - b4aa81d9da52616ac18e6eb584e37a08cfb2ba87 + 4d8029314e75924cfa7be07439bca08f0c9f3403 - + https://github.com/dotnet/runtime - b4aa81d9da52616ac18e6eb584e37a08cfb2ba87 + 4d8029314e75924cfa7be07439bca08f0c9f3403 - + https://github.com/dotnet/runtime - b4aa81d9da52616ac18e6eb584e37a08cfb2ba87 + 4d8029314e75924cfa7be07439bca08f0c9f3403 - + https://github.com/dotnet/runtime - b4aa81d9da52616ac18e6eb584e37a08cfb2ba87 + 4d8029314e75924cfa7be07439bca08f0c9f3403 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b4aa81d9da52616ac18e6eb584e37a08cfb2ba87 + 4d8029314e75924cfa7be07439bca08f0c9f3403 https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 - + https://github.com/dotnet/sdk - e930166ebdf8b0ceb52a0fc066401cbb8c55dd49 + be8363a6e181fcc346deb2d4b6e64eb9ae63fcff - + https://github.com/dotnet/sdk - e930166ebdf8b0ceb52a0fc066401cbb8c55dd49 + be8363a6e181fcc346deb2d4b6e64eb9ae63fcff - + https://github.com/dotnet/sdk - e930166ebdf8b0ceb52a0fc066401cbb8c55dd49 + be8363a6e181fcc346deb2d4b6e64eb9ae63fcff - + https://github.com/dotnet/sdk - e930166ebdf8b0ceb52a0fc066401cbb8c55dd49 + be8363a6e181fcc346deb2d4b6e64eb9ae63fcff https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ d61759559535f43790211fa53be7829dfe598841 - + https://github.com/dotnet/runtime - b4aa81d9da52616ac18e6eb584e37a08cfb2ba87 + 4d8029314e75924cfa7be07439bca08f0c9f3403 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 37f479e2bbf5..89ae485c3bcc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-preview.1.24080.16 - 9.0.100-preview.1.24080.16 - 9.0.100-preview.1.24080.16 + 9.0.100-preview.1.24080.19 + 9.0.100-preview.1.24080.19 + 9.0.100-preview.1.24080.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -99,15 +99,15 @@ - 9.0.0-preview.1.24074.8 + 9.0.0-preview.1.24080.6 - 9.0.0-preview.1.24074.8 - 9.0.0-preview.1.24074.8 - 9.0.0-preview.1.24074.8 - 9.0.0-preview.1.24074.8 - 9.0.0-preview.1.24074.8 + 9.0.0-preview.1.24080.6 + 9.0.0-preview.1.24080.6 + 9.0.0-preview.1.24080.6 + 9.0.0-preview.1.24080.6 + 9.0.0-preview.1.24080.6 2.1.0 From 23629281342fa4651a1b613fc36e588a18e3dbd7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Jan 2024 06:51:23 +0000 Subject: [PATCH 6/9] Update dependencies from https://github.com/dotnet/sdk build 20240130.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.1.24078.3 -> To Version 9.0.100-preview.1.24080.22 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-preview.1.24074.8 -> To Version 9.0.0-preview.1.24080.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53534445a918..8ee0cdd0390d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 - + https://github.com/dotnet/sdk - be8363a6e181fcc346deb2d4b6e64eb9ae63fcff + 5786135a1173f7c802429a1216ae11bbb60af303 - + https://github.com/dotnet/sdk - be8363a6e181fcc346deb2d4b6e64eb9ae63fcff + 5786135a1173f7c802429a1216ae11bbb60af303 - + https://github.com/dotnet/sdk - be8363a6e181fcc346deb2d4b6e64eb9ae63fcff + 5786135a1173f7c802429a1216ae11bbb60af303 - + https://github.com/dotnet/sdk - be8363a6e181fcc346deb2d4b6e64eb9ae63fcff + 5786135a1173f7c802429a1216ae11bbb60af303 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 3cd939f76803da435c20b082a5cfcc844386fcfb - + https://github.com/dotnet/msbuild - 0d8d09e5c582526daeb4af0b52956c3290e424d1 + 97651a25d833ebd284cc7bd8b69bb88630b85b8e diff --git a/eng/Versions.props b/eng/Versions.props index 89ae485c3bcc..87f3eef3aaee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-preview.1.24080.19 - 9.0.100-preview.1.24080.19 - 9.0.100-preview.1.24080.19 + 9.0.100-preview.1.24080.22 + 9.0.100-preview.1.24080.22 + 9.0.100-preview.1.24080.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From daa9434a2be33ad7388d1352bfa358d49792f4ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Jan 2024 08:07:19 +0000 Subject: [PATCH 7/9] Update dependencies from https://github.com/dotnet/sdk build 20240130.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.1.24078.3 -> To Version 9.0.100-preview.1.24080.24 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-preview.1.24074.8 -> To Version 9.0.0-preview.1.24080.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ee0cdd0390d..107bc5de4ae5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,51 +52,51 @@ https://github.com/dotnet/runtime 4d8029314e75924cfa7be07439bca08f0c9f3403 - + https://github.com/dotnet/aspnetcore - 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 + 688559886575a7f0d84b771de5c17501d5daaedc - + https://github.com/dotnet/aspnetcore - 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 + 688559886575a7f0d84b771de5c17501d5daaedc - + https://github.com/dotnet/aspnetcore - 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 + 688559886575a7f0d84b771de5c17501d5daaedc - + https://github.com/dotnet/aspnetcore - 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 + 688559886575a7f0d84b771de5c17501d5daaedc - + https://github.com/dotnet/aspnetcore - 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 + 688559886575a7f0d84b771de5c17501d5daaedc - + https://github.com/dotnet/aspnetcore - 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 + 688559886575a7f0d84b771de5c17501d5daaedc - + https://github.com/dotnet/aspnetcore - 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 + 688559886575a7f0d84b771de5c17501d5daaedc - + https://github.com/dotnet/sdk - 5786135a1173f7c802429a1216ae11bbb60af303 + fdb1394c8ad474d742b9888a88fb0ef3187be421 - + https://github.com/dotnet/sdk - 5786135a1173f7c802429a1216ae11bbb60af303 + fdb1394c8ad474d742b9888a88fb0ef3187be421 - + https://github.com/dotnet/sdk - 5786135a1173f7c802429a1216ae11bbb60af303 + fdb1394c8ad474d742b9888a88fb0ef3187be421 - + https://github.com/dotnet/sdk - 5786135a1173f7c802429a1216ae11bbb60af303 + fdb1394c8ad474d742b9888a88fb0ef3187be421 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 87f3eef3aaee..7c9b88316d1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -73,22 +73,22 @@ - 9.0.0-preview.1.24075.4 - 9.0.0-preview.1.24075.4 - 9.0.0-preview.1.24075.4 - 9.0.0-preview.1.24075.4 - 9.0.0-preview.1.24075.4 - 9.0.0-preview.1.24075.4 - 9.0.0-preview.1.24075.4 + 9.0.0-preview.1.24080.2 + 9.0.0-preview.1.24080.2 + 9.0.0-preview.1.24080.2 + 9.0.0-preview.1.24080.2 + 9.0.0-preview.1.24080.2 + 9.0.0-preview.1.24080.2 + 9.0.0-preview.1.24080.2 0.2.0 - 9.0.100-preview.1.24080.22 - 9.0.100-preview.1.24080.22 - 9.0.100-preview.1.24080.22 + 9.0.100-preview.1.24080.24 + 9.0.100-preview.1.24080.24 + 9.0.100-preview.1.24080.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9084a1d0674722a7fe7780949d97cd5c94954ada Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Jan 2024 09:56:01 +0000 Subject: [PATCH 8/9] Update dependencies from https://github.com/dotnet/sdk build 20240131.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.1.24078.3 -> To Version 9.0.100-preview.1.24081.1 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-preview.1.24074.8 -> To Version 9.0.0-preview.1.24080.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 107bc5de4ae5..04a21157fa81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 688559886575a7f0d84b771de5c17501d5daaedc - + https://github.com/dotnet/sdk - fdb1394c8ad474d742b9888a88fb0ef3187be421 + 7c0b89b644e4a92f9cd36453cdccfd659ed71cbc - + https://github.com/dotnet/sdk - fdb1394c8ad474d742b9888a88fb0ef3187be421 + 7c0b89b644e4a92f9cd36453cdccfd659ed71cbc - + https://github.com/dotnet/sdk - fdb1394c8ad474d742b9888a88fb0ef3187be421 + 7c0b89b644e4a92f9cd36453cdccfd659ed71cbc - + https://github.com/dotnet/sdk - fdb1394c8ad474d742b9888a88fb0ef3187be421 + 7c0b89b644e4a92f9cd36453cdccfd659ed71cbc https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 7c9b88316d1e..6f4dc66890b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-preview.1.24080.24 - 9.0.100-preview.1.24080.24 - 9.0.100-preview.1.24080.24 + 9.0.100-preview.1.24081.1 + 9.0.100-preview.1.24081.1 + 9.0.100-preview.1.24081.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c02aad7447700e26ae811a06dbfcc93ceeba1562 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Jan 2024 10:54:47 +0000 Subject: [PATCH 9/9] Update dependencies from https://github.com/dotnet/sdk build 20240131.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.1.24078.3 -> To Version 9.0.100-preview.1.24081.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-preview.1.24075.3 -> To Version 9.0.0-preview.1.24080.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04a21157fa81..b234ce6fb5bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ 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 - 85b4932a31a185105303259e70347309c5d1e39d + ec2d3c647f4dfde05c7d58c6134387e033deb717 - + https://github.com/dotnet/windowsdesktop - 85b4932a31a185105303259e70347309c5d1e39d + ec2d3c647f4dfde05c7d58c6134387e033deb717 - + https://github.com/dotnet/windowsdesktop - 85b4932a31a185105303259e70347309c5d1e39d + ec2d3c647f4dfde05c7d58c6134387e033deb717 - + https://github.com/dotnet/windowsdesktop - 85b4932a31a185105303259e70347309c5d1e39d + ec2d3c647f4dfde05c7d58c6134387e033deb717 https://github.com/dotnet/runtime @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 688559886575a7f0d84b771de5c17501d5daaedc - + https://github.com/dotnet/sdk - 7c0b89b644e4a92f9cd36453cdccfd659ed71cbc + 405ca8f7b36e85b6e3292c2bca9c772c7f7334db - + https://github.com/dotnet/sdk - 7c0b89b644e4a92f9cd36453cdccfd659ed71cbc + 405ca8f7b36e85b6e3292c2bca9c772c7f7334db - + https://github.com/dotnet/sdk - 7c0b89b644e4a92f9cd36453cdccfd659ed71cbc + 405ca8f7b36e85b6e3292c2bca9c772c7f7334db - + https://github.com/dotnet/sdk - 7c0b89b644e4a92f9cd36453cdccfd659ed71cbc + 405ca8f7b36e85b6e3292c2bca9c772c7f7334db https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 - + https://github.com/dotnet/winforms - 54d6056e0c17b4ddc3262e1c836d2b82ef22bd73 + fb4e1279d6db768ad16e76e69ad73af2155f446f - + https://github.com/dotnet/wpf - 1aac60e5b2b5021a035fb657cb108f438a0d322d + 28aafa073d9156ab1de4850ecb53143850755b39 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6f4dc66890b7..4afe82e8b744 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 9.0.0-preview.1.24075.2 + 9.0.0-preview.1.24080.8 - 9.0.0-preview.1.24075.2 + 9.0.0-preview.1.24080.3 @@ -86,9 +86,9 @@ - 9.0.100-preview.1.24081.1 - 9.0.100-preview.1.24081.1 - 9.0.100-preview.1.24081.1 + 9.0.100-preview.1.24081.4 + 9.0.100-preview.1.24081.4 + 9.0.100-preview.1.24081.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,10 +112,10 @@ - 9.0.0-preview.1.24075.3 - 9.0.0-preview.1.24075.3 - 9.0.0-preview.1.24075.3 - 9.0.0-preview.1.24075.3 + 9.0.0-preview.1.24080.3 + 9.0.0-preview.1.24080.3 + 9.0.0-preview.1.24080.3 + 9.0.0-preview.1.24080.3