From 1d674abffe7ecd734b49f7b5fd838900ab1c5ac5 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Mon, 11 Dec 2023 14:14:13 -0800 Subject: [PATCH 01/20] Fix attribute type checking and use null-conditional operator (#17902) --- .../CheckForPoison.cs | 21 ++++++++++++++----- .../DummyAttributeTypeProvider.cs | 21 +++++++++++-------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs index dab29fae4..1c0eefc9e 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs @@ -347,7 +347,8 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.LeakDetection using var peReader = new PEReader(stream); MetadataReader reader = peReader.GetMetadataReader(); - return reader.CustomAttributes.Select(attrHandle => reader.GetCustomAttribute(attrHandle)) + return reader.CustomAttributes + .Select(attrHandle => reader.GetCustomAttribute(attrHandle)) .Any(attr => IsAttributeSbrp(reader, attr)); } @@ -357,13 +358,23 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.LeakDetection if (attr.Constructor.Kind == HandleKind.MemberReference) { - MemberReference mref = reader.GetMemberReference((MemberReferenceHandle)attr.Constructor); - + var mref = reader.GetMemberReference((MemberReferenceHandle)attr.Constructor); if (mref.Parent.Kind == HandleKind.TypeReference) { - TypeReference tref = reader.GetTypeReference((TypeReferenceHandle)mref.Parent); + var tref = reader.GetTypeReference((TypeReferenceHandle)mref.Parent); attributeType = $"{reader.GetString(tref.Namespace)}.{reader.GetString(tref.Name)}"; } + else if (mref.Parent.Kind == HandleKind.TypeDefinition) + { + var tdef = reader.GetTypeDefinition((TypeDefinitionHandle)mref.Parent); + attributeType = $"{reader.GetString(tdef.Namespace)}.{reader.GetString(tdef.Name)}"; + } + } + else if (attr.Constructor.Kind == HandleKind.MethodDefinition) + { + var mdef = reader.GetMethodDefinition((MethodDefinitionHandle)attr.Constructor); + var tdef = reader.GetTypeDefinition(mdef.GetDeclaringType()); + attributeType = $"{reader.GetString(tdef.Namespace)}.{reader.GetString(tdef.Name)}"; } if (attributeType == SbrpAttributeType) @@ -371,7 +382,7 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.LeakDetection var decodedValue = attr.DecodeValue(DummyAttributeTypeProvider.Instance); try { - return decodedValue.FixedArguments[0].Value.ToString() == "source" && decodedValue.FixedArguments[1].Value.ToString() == "source-build-reference-packages"; + return decodedValue.FixedArguments[0].Value?.ToString() == "source" && decodedValue.FixedArguments[1].Value?.ToString() == "source-build-reference-packages"; } catch { diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/DummyAttributeTypeProvider.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/DummyAttributeTypeProvider.cs index 6f352c88b..158f9cddf 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/DummyAttributeTypeProvider.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/DummyAttributeTypeProvider.cs @@ -7,28 +7,31 @@ using System.Reflection; using System.Reflection.Metadata; using System.Reflection.Metadata.Ecma335; +#nullable enable + namespace Microsoft.DotNet.SourceBuild.Tasks.LeakDetection { // An empty ICustomAttributeTypeProvider implementation is necessary to read metadata attribute values. - internal class DummyAttributeTypeProvider : ICustomAttributeTypeProvider + internal class DummyAttributeTypeProvider : ICustomAttributeTypeProvider { public static readonly DummyAttributeTypeProvider Instance = new(); - public Type GetPrimitiveType(PrimitiveTypeCode typeCode) => default(Type); + public Type? GetPrimitiveType(PrimitiveTypeCode typeCode) => default(Type); - public Type GetSystemType() => default(Type); + public Type? GetSystemType() => default(Type); - public Type GetSZArrayType(Type elementType) => default(Type); + public Type? GetSZArrayType(Type? elementType) => default(Type); - public Type GetTypeFromDefinition(MetadataReader reader, TypeDefinitionHandle handle, byte rawTypeKind) => default(Type); + public Type? GetTypeFromDefinition(MetadataReader reader, TypeDefinitionHandle handle, byte rawTypeKind) => default(Type); - public Type GetTypeFromReference(MetadataReader reader, TypeReferenceHandle handle, byte rawTypeKind) => default(Type); + public Type? GetTypeFromReference(MetadataReader reader, TypeReferenceHandle handle, byte rawTypeKind) => default(Type); - public Type GetTypeFromSerializedName(string name) => default(Type); + public Type? GetTypeFromSerializedName(string name) => default(Type); - public PrimitiveTypeCode GetUnderlyingEnumType(Type type) => default(PrimitiveTypeCode); + public PrimitiveTypeCode GetUnderlyingEnumType(Type? type) => default(PrimitiveTypeCode); - public bool IsSystemType(Type type) => default(bool); + public bool IsSystemType(Type? type) => default(bool); } } + From f28f374a41ffc6162d9448fb4000e335c8445375 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Dec 2023 22:56:40 +0000 Subject: [PATCH 02/20] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231211.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.23611.2 -> To Version 9.0.0-alpha.1.23611.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 68ace7682..1388e617f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -240,9 +240,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 7d438e3e0653a92f45690859e8c8814172496758 + 229464299759d6667e8b907d9c321d31a8dcc123 From 07d644494d0bd9b8a25e15b154ed2a4262a1fc0c Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Mon, 11 Dec 2023 15:22:46 -0800 Subject: [PATCH 03/20] Always run vmr-scan (#17945) --- src/SourceBuild/content/eng/pipelines/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/content/eng/pipelines/ci.yml b/src/SourceBuild/content/eng/pipelines/ci.yml index edefbe789..14cf59bed 100644 --- a/src/SourceBuild/content/eng/pipelines/ci.yml +++ b/src/SourceBuild/content/eng/pipelines/ci.yml @@ -18,8 +18,7 @@ trigger: pr: none stages: -- ${{ if ne(variables['Build.Reason'], 'Schedule') }}: - - template: templates/stages/vmr-scan.yml +- template: templates/stages/vmr-scan.yml - template: /src/installer/eng/pipelines/templates/stages/vmr-build.yml parameters: From 781e19cca5ef5a6890bd2abc87b4f683106e1ece Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 12 Dec 2023 07:53:25 -0600 Subject: [PATCH 04/20] Re-enable smoke tests that rely on templates (#17944) --- .../BasicScenarioTests.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs index 20a22af3c..d2280add4 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs @@ -36,10 +36,9 @@ public class BasicScenarioTests : SdkTests // R2R is not supported on Mono (see https://github.com/dotnet/runtime/issues/88419#issuecomment-1623762676) DotNetActions.Build | DotNetActions.Run | (DotNetHelper.ShouldPublishComplex() ? DotNetActions.None : DotNetActions.PublishComplex) | (helper.IsMonoRuntime ? DotNetActions.None : DotNetActions.PublishR2R)); yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.ClassLib, DotNetActions.Build | DotNetActions.Publish); - // TODO: Uncomment when test templates are updated to net9.0: https://github.com/dotnet/source-build/issues/3668 - // yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.XUnit, DotNetActions.Test); - // yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.NUnit, DotNetActions.Test); - // yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.MSTest, DotNetActions.Test); + yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.XUnit, DotNetActions.Test); + yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.NUnit, DotNetActions.Test); + yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.MSTest, DotNetActions.Test); } } } From f5c0cfe17365592405b5d771d93e5a05856ee7a6 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 12 Dec 2023 08:55:30 -0600 Subject: [PATCH 05/20] Generate default license baseline file in test (#17943) --- .../LicenseScanTests.cs | 17 ++++++++++++++--- .../baselines/licenses/Licenses.arcade.json | 3 --- .../baselines/licenses/Licenses.aspire.json | 3 --- .../baselines/licenses/Licenses.aspnetcore.json | 3 --- .../baselines/licenses/Licenses.cecil.json | 3 --- .../licenses/Licenses.command-line-api.json | 3 --- .../licenses/Licenses.deployment-tools.json | 3 --- .../licenses/Licenses.diagnostics.json | 3 --- .../baselines/licenses/Licenses.emsdk.json | 3 --- .../baselines/licenses/Licenses.format.json | 3 --- .../baselines/licenses/Licenses.fsharp.json | 3 --- .../baselines/licenses/Licenses.installer.json | 3 --- .../baselines/licenses/Licenses.msbuild.json | 3 --- .../licenses/Licenses.nuget-client.json | 3 --- .../baselines/licenses/Licenses.razor.json | 3 --- .../licenses/Licenses.roslyn-analyzers.json | 3 --- .../baselines/licenses/Licenses.roslyn.json | 3 --- .../licenses/Licenses.scenario-tests.json | 3 --- .../assets/baselines/licenses/Licenses.sdk.json | 3 --- ...icenses.source-build-reference-packages.json | 3 --- .../baselines/licenses/Licenses.sourcelink.json | 3 --- .../baselines/licenses/Licenses.symreader.json | 3 --- .../baselines/licenses/Licenses.templating.json | 3 --- .../licenses/Licenses.test-templates.json | 3 --- .../baselines/licenses/Licenses.vstest.json | 3 --- .../licenses/Licenses.windowsdesktop.json | 3 --- .../baselines/licenses/Licenses.winforms.json | 3 --- .../assets/baselines/licenses/Licenses.wpf.json | 3 --- .../assets/baselines/licenses/Licenses.xdt.json | 3 --- .../licenses/Licenses.xliff-tasks.json | 3 --- 30 files changed, 14 insertions(+), 90 deletions(-) delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.arcade.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspnetcore.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.cecil.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.command-line-api.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.deployment-tools.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.diagnostics.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.emsdk.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.format.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.fsharp.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.installer.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.msbuild.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.nuget-client.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.razor.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.roslyn-analyzers.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.roslyn.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.scenario-tests.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.sdk.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.source-build-reference-packages.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.sourcelink.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.symreader.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.templating.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.test-templates.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.vstest.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.windowsdesktop.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.winforms.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.wpf.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.xdt.json delete mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.xliff-tasks.json diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs index 8a088ba4d..844bc45cd 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs @@ -166,12 +166,23 @@ public class LicenseScanTests : TestBase string baselineName = $"Licenses.{_targetRepo}.json"; string baselinePath = BaselineHelper.GetBaselineFilePath(baselineName, BaselineSubDir); - if (!File.Exists(baselinePath)) + string expectedFilePath = Path.Combine(LogsDirectory, baselineName); + if (File.Exists(baselinePath)) { - Assert.Fail($"No license baseline file exists for repo '{_targetRepo}'. Expected file: {baselinePath}"); + File.Copy(baselinePath, expectedFilePath, overwrite: true); + } + else + { + // If there is no license baseline, generate a default empty one. + ScancodeResults defaultResults = new(); + string defaultResultsJson = JsonSerializer.Serialize(defaultResults, options); + File.WriteAllText(expectedFilePath, defaultResultsJson); } - BaselineHelper.CompareBaselineContents(baselineName, json, OutputHelper, Config.WarnOnLicenseScanDiffs, BaselineSubDir); + string actualFilePath = Path.Combine(TestBase.LogsDirectory, $"Updated{baselineName}"); + File.WriteAllText(actualFilePath, json); + + BaselineHelper.CompareFiles(expectedFilePath, actualFilePath, OutputHelper, Config.WarnOnLicenseScanDiffs); } private LicenseExclusion ParseLicenseExclusion(string rawExclusion) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.arcade.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.arcade.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.arcade.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspnetcore.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspnetcore.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspnetcore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.cecil.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.cecil.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.cecil.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.command-line-api.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.command-line-api.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.command-line-api.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.deployment-tools.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.deployment-tools.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.deployment-tools.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.diagnostics.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.diagnostics.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.diagnostics.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.emsdk.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.emsdk.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.emsdk.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.format.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.format.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.format.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.fsharp.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.fsharp.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.fsharp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.installer.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.installer.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.installer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.msbuild.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.msbuild.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.msbuild.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.nuget-client.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.nuget-client.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.nuget-client.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.razor.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.razor.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.razor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.roslyn-analyzers.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.roslyn-analyzers.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.roslyn-analyzers.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.roslyn.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.roslyn.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.roslyn.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.scenario-tests.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.scenario-tests.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.scenario-tests.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.sdk.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.sdk.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.sdk.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.source-build-reference-packages.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.source-build-reference-packages.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.source-build-reference-packages.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.sourcelink.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.sourcelink.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.sourcelink.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.symreader.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.symreader.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.symreader.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.templating.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.templating.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.templating.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.test-templates.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.test-templates.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.test-templates.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.vstest.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.vstest.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.vstest.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.windowsdesktop.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.windowsdesktop.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.windowsdesktop.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.winforms.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.winforms.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.winforms.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.wpf.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.wpf.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.wpf.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.xdt.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.xdt.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.xdt.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.xliff-tasks.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.xliff-tasks.json deleted file mode 100644 index 6941fa698..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.xliff-tasks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": [] -} \ No newline at end of file From db0e87e4f0ea9fb3f26da28883d11d49239e46f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 15:20:34 +0000 Subject: [PATCH 06/20] [main] Update dependencies from dotnet/arcade (#17949) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- eng/common/build.ps1 | 3 +++ eng/common/build.sh | 8 ++++++++ eng/common/tools.ps1 | 3 ++- global.json | 4 ++-- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1388e617f..4937c04e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,18 +211,18 @@ - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e https://github.com/dotnet/arcade-services @@ -232,9 +232,9 @@ https://github.com/dotnet/arcade-services 5263b603d90991a0c200aca8b8892c3d7cfe4751 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f85e736f6..cf2003482 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 9.0.0-beta.23607.2 + 9.0.0-beta.23611.2 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 33a6f2d0e..066044f62 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -19,6 +19,7 @@ Param( [switch] $pack, [switch] $publish, [switch] $clean, + [switch] $verticalBuild, [switch][Alias('bl')]$binaryLog, [switch][Alias('nobl')]$excludeCIBinarylog, [switch] $ci, @@ -58,6 +59,7 @@ function Print-Usage() { Write-Host " -sign Sign build outputs" Write-Host " -publish Publish artifacts (e.g. symbols)" Write-Host " -clean Clean the solution" + Write-Host " -verticalBuild Run in 'vertical build' infra mode." Write-Host "" Write-Host "Advanced settings:" @@ -120,6 +122,7 @@ function Build { /p:Deploy=$deploy ` /p:Test=$test ` /p:Pack=$pack ` + /p:ArcadeBuildVertical=$verticalBuild ` /p:IntegrationTest=$integrationTest ` /p:PerformanceTest=$performanceTest ` /p:Sign=$sign ` diff --git a/eng/common/build.sh b/eng/common/build.sh index 2c17ba529..5ce01dd16 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -59,6 +59,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" restore=false build=false source_build=false +vertical_build=false rebuild=false test=false integration_test=false @@ -129,6 +130,12 @@ while [[ $# > 0 ]]; do restore=true pack=true ;; + -verticalbuild|-vb) + build=true + vertical_build=true + restore=true + pack=true + ;; -test|-t) test=true ;; @@ -220,6 +227,7 @@ function Build { /p:Restore=$restore \ /p:Build=$build \ /p:ArcadeBuildFromSource=$source_build \ + /p:ArcadeBuildVertical=$vertical_build \ /p:Rebuild=$rebuild \ /p:Test=$test \ /p:Pack=$pack \ diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index e8def7e6a..162dee2b9 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -827,7 +827,8 @@ function MSBuild-Core() { } } - $env:ARCADE_BUILD_TOOL_COMMAND = "$($buildTool.Path) $cmdArgs" + # Be sure quote the path in case there are spaces in the dotnet installation location. + $env:ARCADE_BUILD_TOOL_COMMAND = "`"$($buildTool.Path)`" $cmdArgs" $exitCode = Exec-Process $buildTool.Path $cmdArgs diff --git a/global.json b/global.json index 1834e0ff0..4787071d4 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.23607.2", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23607.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23611.2", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23611.2" } } From 40b58d4c656726934f6e536c1b10ab5e7960c03c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 16:03:03 +0000 Subject: [PATCH 07/20] [main] Update dependencies from dotnet/source-build-externals (#17950) [main] Update dependencies from dotnet/source-build-externals --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4937c04e7..a6ba8efe0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -190,9 +190,9 @@ 1d174267bf45dabbadb12602b1170329611fd219 - + https://github.com/dotnet/source-build-externals - 2e66b74da89aabcce9628cfc4b7a2925c54f6841 + bc555088c6b4862ad0b93fbc245ef0628e661256 From c8ff354f708ae7dff4f6f61a2715c3e4a0af163b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 16:04:41 +0000 Subject: [PATCH 08/20] [main] Update dependencies from dotnet/test-templates (#17948) [main] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6ba8efe0..f646611ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -106,22 +106,22 @@ https://github.com/dotnet/test-templates 307b8f538d83a955d8f6dd909eee41a5555f2f4d - + https://github.com/dotnet/test-templates - 45226f35518e3152b5a54ed7a90ae66bcae22944 + ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/test-templates - 45226f35518e3152b5a54ed7a90ae66bcae22944 + ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/test-templates - 45226f35518e3152b5a54ed7a90ae66bcae22944 + ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/test-templates - 45226f35518e3152b5a54ed7a90ae66bcae22944 + ec54b2c1553db0a544ef0e8595be2318fc12e08d diff --git a/eng/Versions.props b/eng/Versions.props index cf2003482..1c533f09e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,10 +62,10 @@ 1.1.0-rc.22558.1 1.1.0-rc.23558.1 - 1.1.0-rc.23607.1 - 1.1.0-rc.23607.1 - 1.1.0-rc.23607.1 - 1.1.0-rc.23607.1 + 1.1.0-rc.23612.1 + 1.1.0-rc.23612.1 + 1.1.0-rc.23612.1 + 1.1.0-rc.23612.1 From f1a5a5b94e958c5642ae5d107fe3b593a86e9ab0 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 12 Dec 2023 16:30:41 -0600 Subject: [PATCH 09/20] Add roslyn patch to use NetCurrent (#17951) --- ...001-Use-NetCurrent-instead-of-net8.0.patch | 127 ++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 src/SourceBuild/patches/roslyn/0001-Use-NetCurrent-instead-of-net8.0.patch diff --git a/src/SourceBuild/patches/roslyn/0001-Use-NetCurrent-instead-of-net8.0.patch b/src/SourceBuild/patches/roslyn/0001-Use-NetCurrent-instead-of-net8.0.patch new file mode 100644 index 000000000..05a1d13dc --- /dev/null +++ b/src/SourceBuild/patches/roslyn/0001-Use-NetCurrent-instead-of-net8.0.patch @@ -0,0 +1,127 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Tue, 12 Dec 2023 09:47:37 -0600 +Subject: [PATCH] Use NetCurrent instead of net8.0 + +Backport: https://github.com/dotnet/roslyn/pull/71229 +--- + .../Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj | 2 +- + src/CodeStyle/Tools/CodeStyleConfigFileGenerator.csproj | 2 +- + .../Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj | 2 +- + .../BoundTreeGenerator/CompilersBoundTreeGenerator.csproj | 2 +- + .../CSharpErrorFactsGenerator.csproj | 2 +- + .../Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj | 4 ++-- + .../VisualBasicErrorFactsGenerator.vbproj | 2 +- + .../VisualBasicSyntaxGenerator.vbproj | 2 +- + 8 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj b/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj +index c89a8cf4c11..a443f463427 100644 +--- a/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj ++++ b/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj +@@ -31,7 +31,7 @@ + $(DotNetRoot)dotnet + + +- ++ + + + <_File Include="$(CSharpCodeStyleAnalyzerArtifactsBinDir)\Microsoft.CodeAnalysis.CSharp.CodeStyle.dll" TargetDir="analyzers/dotnet/cs" /> +diff --git a/src/CodeStyle/Tools/CodeStyleConfigFileGenerator.csproj b/src/CodeStyle/Tools/CodeStyleConfigFileGenerator.csproj +index f5fc7205ca2..d014b53081c 100644 +--- a/src/CodeStyle/Tools/CodeStyleConfigFileGenerator.csproj ++++ b/src/CodeStyle/Tools/CodeStyleConfigFileGenerator.csproj +@@ -1,7 +1,7 @@ +  + + Exe +- net8.0 ++ $(NetCurrent) + true + false + false +diff --git a/src/CodeStyle/VisualBasic/CodeFixes/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj b/src/CodeStyle/VisualBasic/CodeFixes/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj +index da7b22020e7..2970771349a 100644 +--- a/src/CodeStyle/VisualBasic/CodeFixes/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj ++++ b/src/CodeStyle/VisualBasic/CodeFixes/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj +@@ -31,7 +31,7 @@ + $(DotNetRoot)dotnet + + +- ++ + + + <_File Include="$(VisualBasicCodeStyleAnalyzerArtifactsBinDir)\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.dll" TargetDir="analyzers/dotnet/vb" /> +diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj +index 6ee9d977752..56b24937c1b 100644 +--- a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj ++++ b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj +@@ -5,7 +5,7 @@ + Exe + Roslyn.Compilers.Internal.BoundTreeGenerator + BoundTreeGenerator +- net8.0 ++ $(NetCurrent) + false + + +\ No newline at end of file +diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj +index 63446bef0f8..8b32c86f32a 100644 +--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj ++++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj +@@ -4,7 +4,7 @@ + + Exe + Roslyn.Compilers.CSharp.Internal.CSharpErrorFactsGenerator +- net8.0 ++ $(NetCurrent) + false + + +\ No newline at end of file +diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj +index 9f8b8b05f26..6f59c13265d 100644 +--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj ++++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj +@@ -3,9 +3,9 @@ + + + CSharpSyntaxGenerator +- +- net8.0;netstandard2.0 ++ $(NetCurrent);netstandard2.0 + Exe + $(RoslynPortableRuntimeIdentifiers) + false +diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj +index a0f43f33de2..440aa28e6d4 100644 +--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj ++++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj +@@ -6,7 +6,7 @@ + + Microsoft.CodeAnalysis.VisualBasic.Internal.VBErrorFactsGenerator + VBErrorFactsGenerator +- net8.0 ++ $(NetCurrent) + false + + +\ No newline at end of file +diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj +index 1cd0dc4b549..91cc5f2a4ec 100644 +--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj ++++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj +@@ -7,7 +7,7 @@ + Microsoft.CodeAnalysis.VisualBasic.Internal.VBSyntaxGenerator + VBSyntaxGenerator + Off +- net8.0 ++ $(NetCurrent) + false + + From 7cfe9149ec1f8e1a0b632d3babb868d273aa9242 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Tue, 12 Dec 2023 14:42:58 -0800 Subject: [PATCH 10/20] Update dev containers to Fedora 39 (#17954) --- .devcontainer/vmr-source-build/devcontainer.json | 4 ++-- src/SourceBuild/content/.devcontainer/devcontainer.json | 4 ++-- .../content/.devcontainer/prebuilt-sdk/devcontainer.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.devcontainer/vmr-source-build/devcontainer.json b/.devcontainer/vmr-source-build/devcontainer.json index 01eecb5dd..bfa89572c 100644 --- a/.devcontainer/vmr-source-build/devcontainer.json +++ b/.devcontainer/vmr-source-build/devcontainer.json @@ -3,7 +3,7 @@ // The container supports source-building the SDK { "name": "VMR with PR changes", - "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36", + "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39", "hostRequirements": { // A completely source built .NET is >64 GB with all the repos/artifacts "storage": "128gb" @@ -22,4 +22,4 @@ }, "onCreateCommand": "${containerWorkspaceFolder}/installer/.devcontainer/vmr-source-build/init.sh", "workspaceFolder": "/workspaces" -} \ No newline at end of file +} diff --git a/src/SourceBuild/content/.devcontainer/devcontainer.json b/src/SourceBuild/content/.devcontainer/devcontainer.json index 6061a0eff..b0e1db0a4 100644 --- a/src/SourceBuild/content/.devcontainer/devcontainer.json +++ b/src/SourceBuild/content/.devcontainer/devcontainer.json @@ -1,7 +1,7 @@ // Container contains checked-out source code only { "name": "Default", - "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36", + "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39", "hostRequirements": { // A completely source built .NET is >64 GB with all the repos/artifacts "storage": "128gb" @@ -19,4 +19,4 @@ } }, "onCreateCommand": ".devcontainer/init.sh" -} \ No newline at end of file +} diff --git a/src/SourceBuild/content/.devcontainer/prebuilt-sdk/devcontainer.json b/src/SourceBuild/content/.devcontainer/prebuilt-sdk/devcontainer.json index eaff85ffd..d7d96d1c1 100644 --- a/src/SourceBuild/content/.devcontainer/prebuilt-sdk/devcontainer.json +++ b/src/SourceBuild/content/.devcontainer/prebuilt-sdk/devcontainer.json @@ -1,7 +1,7 @@ // Container contains a pre-built SDK { "name": "Pre-built .NET SDK", - "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36", + "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39", "hostRequirements": { // A completely source built .NET is >64 GB with all the repos/artifacts "storage": "128gb" @@ -19,4 +19,4 @@ } }, "onCreateCommand": ".devcontainer/prebuilt-sdk/init.sh" -} \ No newline at end of file +} From c947c12af4c15c0b402359d268796ec148bb7eb2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 11:57:28 +0100 Subject: [PATCH 11/20] [main] Update dependencies from dotnet/sdk (#17875) Co-authored-by: dotnet-maestro[bot] Co-authored-by: JL03-Yue <59816815+JL03-Yue@users.noreply.github.com> Co-authored-by: Larry Ewing Co-authored-by: Matt Thalman Co-authored-by: Marek Safar --- eng/Version.Details.xml | 132 +++++++++--------- eng/Versions.props | 54 +++---- .../0002-Update-MSBuild-ref-dependency.patch | 23 +++ test/EndToEnd/ProjectBuildTests.cs | 2 +- 4 files changed, 117 insertions(+), 94 deletions(-) create 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 f646611ee..ad0dcfd39 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 - c2ba2e4e71b06b9f14165f9902e54259fe42e129 + 696e213652005495ed7a103839772d1c249df7db - + https://github.com/dotnet/windowsdesktop - c2ba2e4e71b06b9f14165f9902e54259fe42e129 + 696e213652005495ed7a103839772d1c249df7db - + https://github.com/dotnet/windowsdesktop - c2ba2e4e71b06b9f14165f9902e54259fe42e129 + 696e213652005495ed7a103839772d1c249df7db - + https://github.com/dotnet/windowsdesktop - c2ba2e4e71b06b9f14165f9902e54259fe42e129 + 696e213652005495ed7a103839772d1c249df7db - + https://github.com/dotnet/runtime - a26802aa5793060c512359c2be83e9a4c51964c1 + ab1a8224cdf115b65e0db5dc88d11f205068f444 - + https://github.com/dotnet/runtime - a26802aa5793060c512359c2be83e9a4c51964c1 + ab1a8224cdf115b65e0db5dc88d11f205068f444 - + https://github.com/dotnet/runtime - a26802aa5793060c512359c2be83e9a4c51964c1 + ab1a8224cdf115b65e0db5dc88d11f205068f444 - + https://github.com/dotnet/runtime - a26802aa5793060c512359c2be83e9a4c51964c1 + ab1a8224cdf115b65e0db5dc88d11f205068f444 - + https://github.com/dotnet/runtime - a26802aa5793060c512359c2be83e9a4c51964c1 + ab1a8224cdf115b65e0db5dc88d11f205068f444 @@ -48,55 +48,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - a26802aa5793060c512359c2be83e9a4c51964c1 + ab1a8224cdf115b65e0db5dc88d11f205068f444 - + https://github.com/dotnet/aspnetcore - 7e9b1492baa02211842422566c0e8710886cace1 + 459a4884bf3ccd1f50ada2244a6c2da6a939ae0d - + https://github.com/dotnet/aspnetcore - 7e9b1492baa02211842422566c0e8710886cace1 + 459a4884bf3ccd1f50ada2244a6c2da6a939ae0d - + https://github.com/dotnet/aspnetcore - 7e9b1492baa02211842422566c0e8710886cace1 + 459a4884bf3ccd1f50ada2244a6c2da6a939ae0d - + https://github.com/dotnet/aspnetcore - 7e9b1492baa02211842422566c0e8710886cace1 + 459a4884bf3ccd1f50ada2244a6c2da6a939ae0d - + https://github.com/dotnet/aspnetcore - 7e9b1492baa02211842422566c0e8710886cace1 + 459a4884bf3ccd1f50ada2244a6c2da6a939ae0d - + https://github.com/dotnet/aspnetcore - 7e9b1492baa02211842422566c0e8710886cace1 + 459a4884bf3ccd1f50ada2244a6c2da6a939ae0d - + https://github.com/dotnet/aspnetcore - 7e9b1492baa02211842422566c0e8710886cace1 + 459a4884bf3ccd1f50ada2244a6c2da6a939ae0d - + https://github.com/dotnet/sdk - 96b3ef8aecc8e71f067e04ea02401b13bc8bcca7 + 6ad1cd1de740d3332af31bd57afef0070b7a3329 - + https://github.com/dotnet/sdk - 96b3ef8aecc8e71f067e04ea02401b13bc8bcca7 + 6ad1cd1de740d3332af31bd57afef0070b7a3329 - + https://github.com/dotnet/sdk - 96b3ef8aecc8e71f067e04ea02401b13bc8bcca7 + 6ad1cd1de740d3332af31bd57afef0070b7a3329 - + https://github.com/dotnet/sdk - 96b3ef8aecc8e71f067e04ea02401b13bc8bcca7 + 6ad1cd1de740d3332af31bd57afef0070b7a3329 https://github.com/dotnet/test-templates @@ -124,54 +124,54 @@ ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/winforms - 0112f1b00b9608cd10bf9f92fad16b1bd84dc76f + e1393ed208a58a6a2f864ac5ae9cd8ae965d236c - + https://github.com/dotnet/wpf - f398b952977b861a20c37ae7982032cae9d9f0a5 + 8e3e1a550c591a7732df79f075716b88af692b43 - + https://github.com/dotnet/fsharp - 5a2ef93ff28d0a9a7e9419d652e9b009557e3925 + bb832169d6b799a62962452212010e66c3fecacf - + https://github.com/dotnet/fsharp - 5a2ef93ff28d0a9a7e9419d652e9b009557e3925 + bb832169d6b799a62962452212010e66c3fecacf - + https://github.com/microsoft/vstest - 94c5e8d3b9a54b6814ea7003be18f37c7c558fbc + 50c0f7889fdd8d13381d325bdbb6d253e33da1ff - + https://github.com/dotnet/runtime - a26802aa5793060c512359c2be83e9a4c51964c1 + ab1a8224cdf115b65e0db5dc88d11f205068f444 - + https://github.com/dotnet/roslyn - 1f802118804658a38c932c885bfc82a9d0f38e86 + 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 - + https://github.com/dotnet/msbuild - 31108edc1f9cafc0103ed467906a31ddd8f914fa + 2f3d37672a69142a13a62856b09034a915bedc70 - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 400ac5960800c110213fe2a6069e40879f2d8fbe https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 74e4868be8423562ba8ec2aac522f94a8c2c9f37 + f0e25ac1b9cf1df8bbe6e873993ad74ce3ca8d26 @@ -179,15 +179,15 @@ 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/deployment-tools - 1d174267bf45dabbadb12602b1170329611fd219 + 0d6c22d227b318fb253c967e1ac041b8e68e7e7d - + https://github.com/dotnet/deployment-tools - 1d174267bf45dabbadb12602b1170329611fd219 + 0d6c22d227b318fb253c967e1ac041b8e68e7e7d diff --git a/eng/Versions.props b/eng/Versions.props index 1c533f09e..b5ee7e341 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 9.0.0-alpha.1.23575.1 + 9.0.0-alpha.1.23605.3 - 9.0.0-alpha.1.23575.1 + 9.0.0-alpha.1.23606.2 @@ -73,50 +73,50 @@ - 9.0.0-alpha.1.23577.26 - 9.0.0-alpha.1.23577.26 - 9.0.0-alpha.1.23577.26 - 9.0.0-alpha.1.23577.26 - 9.0.0-alpha.1.23577.26 - 9.0.0-alpha.1.23577.26 - 9.0.0-alpha.1.23577.26 + 9.0.0-alpha.1.23612.4 + 9.0.0-alpha.1.23612.4 + 9.0.0-alpha.1.23612.4 + 9.0.0-alpha.1.23612.4 + 9.0.0-alpha.1.23612.4 + 9.0.0-alpha.1.23612.4 + 9.0.0-alpha.1.23612.4 0.2.0 - 9.0.100-alpha.1.23577.21 - 9.0.100-alpha.1.23577.21 - 9.0.100-alpha.1.23577.21 + 9.0.100-alpha.1.23613.1 + 9.0.100-alpha.1.23613.1 + 9.0.100-alpha.1.23613.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-2.23563.6 + 4.9.0-3.23612.11 - 9.0.0-alpha.1.23577.7 + 9.0.0-alpha.1.23612.13 - 9.0.0-alpha.1.23577.7 - 9.0.0-alpha.1.23577.7 - 9.0.0-alpha.1.23577.7 - 9.0.0-alpha.1.23577.7 - 9.0.0-alpha.1.23577.7 + 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 8.0.0-rc.1.23414.4 2.1.0 - 9.0.0-alpha.1.23576.1 - 9.0.0-alpha.1.23576.1 - 9.0.0-alpha.1.23576.1 - 9.0.0-alpha.1.23576.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.23612.1 @@ -128,11 +128,11 @@ - 6.9.0-preview.1.45 + 6.9.0-preview.1.52 - 2.0.0-preview.1.23509.2 + 2.0.0-preview.1.23601.1 @@ -246,7 +246,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23574-01 + 17.9.0-preview-23610-02 8.0.0-alpha.1.22557.12 8.0.0-preview.23424.2 @@ -262,7 +262,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 9.0.0-alpha.1.23572.3 + 9.0.0-alpha.1.23611.2 $(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 new file mode 100644 index 000000000..631903885 --- /dev/null +++ b/src/SourceBuild/patches/roslyn/0002-Update-MSBuild-ref-dependency.patch @@ -0,0 +1,23 @@ +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 + - 9.0.0-alpha.1.23612.4 - 9.0.0-alpha.1.23612.4 - 9.0.0-alpha.1.23612.4 - 9.0.0-alpha.1.23612.4 - 9.0.0-alpha.1.23612.4 - 9.0.0-alpha.1.23612.4 - 9.0.0-alpha.1.23612.4 + 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 0.2.0 - 9.0.100-alpha.1.23613.1 - 9.0.100-alpha.1.23613.1 - 9.0.100-alpha.1.23613.1 + 9.0.100-alpha.1.23613.2 + 9.0.100-alpha.1.23613.2 + 9.0.100-alpha.1.23613.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b79375ac59baa1bbb1c741b9136743554a75d719 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 13:23:55 +0000 Subject: [PATCH 13/20] Update dependencies from https://github.com/dotnet/arcade build 20231212.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23611.2 -> To Version 9.0.0-beta.23612.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad0dcfd39..4c941b03a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,18 +211,18 @@ - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d https://github.com/dotnet/arcade-services @@ -232,9 +232,9 @@ https://github.com/dotnet/arcade-services 5263b603d90991a0c200aca8b8892c3d7cfe4751 - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b5ee7e341..d1277035a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 9.0.0-beta.23611.2 + 9.0.0-beta.23612.2 diff --git a/global.json b/global.json index 4787071d4..5ad922d74 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.23611.2", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23611.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23612.2", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23612.2" } } From 4dff7c253fd15d6aca1ad7311187813f00b58414 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 15:56:31 +0000 Subject: [PATCH 14/20] Update dependencies from https://github.com/dotnet/sdk build 20231213.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23613.1 -> To Version 9.0.100-alpha.1.23613.3 Dependency coherency updates 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 From Version 9.0.0-alpha.1.23612.4 -> To Version 9.0.0-alpha.1.23612.5 (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 c54d883c1..fa6aae769 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 15194b0a34157cdaf7c0e6e0813929aff2356986 - + https://github.com/dotnet/sdk - d4f622e1e5f5680d416fc913f1427b8b894cc464 + 7b6a4643d27fb2808923ef6e6558d43223cfb064 - + https://github.com/dotnet/sdk - d4f622e1e5f5680d416fc913f1427b8b894cc464 + 7b6a4643d27fb2808923ef6e6558d43223cfb064 - + https://github.com/dotnet/sdk - d4f622e1e5f5680d416fc913f1427b8b894cc464 + 7b6a4643d27fb2808923ef6e6558d43223cfb064 - + https://github.com/dotnet/sdk - d4f622e1e5f5680d416fc913f1427b8b894cc464 + 7b6a4643d27fb2808923ef6e6558d43223cfb064 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 375f053ba..8bc09f494 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23613.2 - 9.0.100-alpha.1.23613.2 - 9.0.100-alpha.1.23613.2 + 9.0.100-alpha.1.23613.3 + 9.0.100-alpha.1.23613.3 + 9.0.100-alpha.1.23613.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From becf66781342a5281ec755017b3f0300eb7335fa Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Wed, 13 Dec 2023 08:55:53 -0800 Subject: [PATCH 15/20] Remove global CheckEolTargetFramework=false (#17958) --- src/SourceBuild/content/repo-projects/Directory.Build.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 266ebe7ce..d4d3f3aeb 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -119,9 +119,6 @@ - - - From 27d05d31eb3bb307a36d466704601a284e160280 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 13 Dec 2023 09:12:31 -0800 Subject: [PATCH 16/20] Remove DotNetCoreSdkDir (#17963) --- src/SourceBuild/content/repo-projects/msbuild.proj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/SourceBuild/content/repo-projects/msbuild.proj b/src/SourceBuild/content/repo-projects/msbuild.proj index ac9e32455..36c6ab7c0 100644 --- a/src/SourceBuild/content/repo-projects/msbuild.proj +++ b/src/SourceBuild/content/repo-projects/msbuild.proj @@ -10,7 +10,6 @@ $(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg) $(BuildCommandArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg) $(BuildCommandArgs) $(OutputVersionArgs) - $(BuildCommandArgs) /p:DotNetCoreSdkDir=$(DotNetCliToolDir) $(StandardSourceBuildCommand) $(BuildCommandArgs) From 8c98d582e33d2673110df7c091bae57397907335 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 22:15:50 +0000 Subject: [PATCH 17/20] Update dependencies from https://github.com/dotnet/sdk build 20231213.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23613.1 -> To Version 9.0.100-alpha.1.23613.5 Dependency coherency updates 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 From Version 9.0.0-alpha.1.23612.4 -> To Version 9.0.0-alpha.1.23612.5 (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 fa6aae769..b1d8b5e71 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 15194b0a34157cdaf7c0e6e0813929aff2356986 - + https://github.com/dotnet/sdk - 7b6a4643d27fb2808923ef6e6558d43223cfb064 + cfce8c40ab83503565f0930be7b90064211d5c70 - + https://github.com/dotnet/sdk - 7b6a4643d27fb2808923ef6e6558d43223cfb064 + cfce8c40ab83503565f0930be7b90064211d5c70 - + https://github.com/dotnet/sdk - 7b6a4643d27fb2808923ef6e6558d43223cfb064 + cfce8c40ab83503565f0930be7b90064211d5c70 - + https://github.com/dotnet/sdk - 7b6a4643d27fb2808923ef6e6558d43223cfb064 + cfce8c40ab83503565f0930be7b90064211d5c70 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 8bc09f494..ef9d86f96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23613.3 - 9.0.100-alpha.1.23613.3 - 9.0.100-alpha.1.23613.3 + 9.0.100-alpha.1.23613.5 + 9.0.100-alpha.1.23613.5 + 9.0.100-alpha.1.23613.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3f671bb680b3fcf43c84c32cc792b0180b79619f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 23:17:41 +0000 Subject: [PATCH 18/20] Update dependencies from https://github.com/dotnet/sdk build 20231213.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23613.1 -> To Version 9.0.100-alpha.1.23613.6 Dependency coherency updates 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 From Version 9.0.0-alpha.1.23612.4 -> To Version 9.0.0-alpha.1.23612.5 (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 b1d8b5e71..7961685f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 15194b0a34157cdaf7c0e6e0813929aff2356986 - + https://github.com/dotnet/sdk - cfce8c40ab83503565f0930be7b90064211d5c70 + bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 - + https://github.com/dotnet/sdk - cfce8c40ab83503565f0930be7b90064211d5c70 + bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 - + https://github.com/dotnet/sdk - cfce8c40ab83503565f0930be7b90064211d5c70 + bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 - + https://github.com/dotnet/sdk - cfce8c40ab83503565f0930be7b90064211d5c70 + bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ef9d86f96..6528be3a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23613.5 - 9.0.100-alpha.1.23613.5 - 9.0.100-alpha.1.23613.5 + 9.0.100-alpha.1.23613.6 + 9.0.100-alpha.1.23613.6 + 9.0.100-alpha.1.23613.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c56fb02646de176ae5546f983e0d597f29eaf2cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 00:09:54 +0000 Subject: [PATCH 19/20] [main] Update dependencies from dotnet/scenario-tests (#17968) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad0dcfd39..d9e29f184 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -245,9 +245,9 @@ 229464299759d6667e8b907d9c321d31a8dcc123 - + https://github.com/dotnet/scenario-tests - 8af694a5e3986a27ccfee1a638ba311c7e9bc55d + 0589a90cb11bb1daf9c05f20c1dc2d78c49075f2 diff --git a/eng/Versions.props b/eng/Versions.props index b5ee7e341..0d8913908 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,7 +248,7 @@ 2.0.0 17.9.0-preview-23610-02 8.0.0-alpha.1.22557.12 - 8.0.0-preview.23424.2 + 9.0.0-preview.23613.1 From 74bcdc33105f0ed78be3e1e27951b1958ad6b5a9 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 14 Dec 2023 08:35:43 -0600 Subject: [PATCH 20/20] 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