From 67c497aaafe5b68b5a65dd28756c60ffe92a4f36 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 28 Nov 2022 07:48:11 -0500 Subject: [PATCH 01/43] repos/sdk.proj: set NativeAotSupported=false on arm platform --- src/SourceBuild/tarball/content/repos/sdk.proj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SourceBuild/tarball/content/repos/sdk.proj b/src/SourceBuild/tarball/content/repos/sdk.proj index c18e00dd6..54e90ec3e 100644 --- a/src/SourceBuild/tarball/content/repos/sdk.proj +++ b/src/SourceBuild/tarball/content/repos/sdk.proj @@ -7,6 +7,9 @@ $(BuildCommandArgs) /p:PackageProjectUrl=https://github.com/dotnet/sdk $(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltToolsetDir) + + $(BuildCommandArgs) /p:NativeAotSupported=false + true $(BuildCommandArgs) -v $(LogVerbosity) From bd560c838607fc408341a9926bbe9d048599dd49 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Jan 2023 07:29:56 +0000 Subject: [PATCH 02/43] Update dependencies from https://github.com/dotnet/sdk build 20230110.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23060.29 --- 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 0b07a18f4..7c8510771 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 diff --git a/eng/Versions.props b/eng/Versions.props index ab98126a4..c9ff714f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23060.2 - 7.0.200-preview.23060.2 - 7.0.200-preview.23060.2 + 7.0.200-preview.23060.29 + 7.0.200-preview.23060.29 + 7.0.200-preview.23060.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c440b14c6b6fd3615d0a405f1c015ffa30fb8779 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Jan 2023 14:04:00 +0000 Subject: [PATCH 03/43] Update dependencies from https://github.com/dotnet/sdk build 20230111.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23061.6 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (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 7c8510771..0c81aa436 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 + 3775f55d55278c31dff6303dbc21675c8974415e - + https://github.com/dotnet/sdk - d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 + 3775f55d55278c31dff6303dbc21675c8974415e - + https://github.com/dotnet/sdk - d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 + 3775f55d55278c31dff6303dbc21675c8974415e - + https://github.com/dotnet/sdk - d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 + 3775f55d55278c31dff6303dbc21675c8974415e @@ -149,9 +149,9 @@ 8ad2e6240cb7426d83f1b45241f8f33bddf3d474 - + https://github.com/dotnet/msbuild - ab3d68e815ba13916d6d3a653445d71ad238c723 + 040e2a90ee794997fc9716487280a54b0ad8fe2a diff --git a/eng/Versions.props b/eng/Versions.props index c9ff714f8..d17412fa4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23060.29 - 7.0.200-preview.23060.29 - 7.0.200-preview.23060.29 + 7.0.200-preview.23061.6 + 7.0.200-preview.23061.6 + 7.0.200-preview.23061.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2ea1e293fc6775b510818c10cd171e395496a46c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Jan 2023 19:18:25 +0000 Subject: [PATCH 04/43] Update dependencies from https://github.com/dotnet/sdk build 20230111.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23061.14 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (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 0c81aa436..b8a0a8695 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 3775f55d55278c31dff6303dbc21675c8974415e + c2bd68458f383e37fe68edf269f4364c63d08de1 - + https://github.com/dotnet/sdk - 3775f55d55278c31dff6303dbc21675c8974415e + c2bd68458f383e37fe68edf269f4364c63d08de1 - + https://github.com/dotnet/sdk - 3775f55d55278c31dff6303dbc21675c8974415e + c2bd68458f383e37fe68edf269f4364c63d08de1 - + https://github.com/dotnet/sdk - 3775f55d55278c31dff6303dbc21675c8974415e + c2bd68458f383e37fe68edf269f4364c63d08de1 diff --git a/eng/Versions.props b/eng/Versions.props index d17412fa4..0a706cabd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23061.6 - 7.0.200-preview.23061.6 - 7.0.200-preview.23061.6 + 7.0.200-preview.23061.14 + 7.0.200-preview.23061.14 + 7.0.200-preview.23061.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4c4d12dc907f5b439660ff5c3f5ffe157d675fa9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 02:58:39 +0000 Subject: [PATCH 05/43] Update dependencies from https://github.com/dotnet/sdk build 20230111.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23061.33 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (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 b8a0a8695..dc0e5b652 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c2bd68458f383e37fe68edf269f4364c63d08de1 + ca0e775a64eb7542710d72aea1439528be1a6a03 - + https://github.com/dotnet/sdk - c2bd68458f383e37fe68edf269f4364c63d08de1 + ca0e775a64eb7542710d72aea1439528be1a6a03 - + https://github.com/dotnet/sdk - c2bd68458f383e37fe68edf269f4364c63d08de1 + ca0e775a64eb7542710d72aea1439528be1a6a03 - + https://github.com/dotnet/sdk - c2bd68458f383e37fe68edf269f4364c63d08de1 + ca0e775a64eb7542710d72aea1439528be1a6a03 diff --git a/eng/Versions.props b/eng/Versions.props index 0a706cabd..6da7deb96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23061.14 - 7.0.200-preview.23061.14 - 7.0.200-preview.23061.14 + 7.0.200-preview.23061.33 + 7.0.200-preview.23061.33 + 7.0.200-preview.23061.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b891269556e9e6fa4de1c2d2b4b5ced1156aadce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 05:00:50 +0000 Subject: [PATCH 06/43] Update dependencies from https://github.com/dotnet/sdk build 20230111.40 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23061.40 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (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 dc0e5b652..b1e919104 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - ca0e775a64eb7542710d72aea1439528be1a6a03 + ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 - + https://github.com/dotnet/sdk - ca0e775a64eb7542710d72aea1439528be1a6a03 + ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 - + https://github.com/dotnet/sdk - ca0e775a64eb7542710d72aea1439528be1a6a03 + ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 - + https://github.com/dotnet/sdk - ca0e775a64eb7542710d72aea1439528be1a6a03 + ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 diff --git a/eng/Versions.props b/eng/Versions.props index 6da7deb96..b3cc36385 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23061.33 - 7.0.200-preview.23061.33 - 7.0.200-preview.23061.33 + 7.0.200-preview.23061.40 + 7.0.200-preview.23061.40 + 7.0.200-preview.23061.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9ace0008ecaca153d9fe5bf4582b8e6cfbfff33b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 08:15:42 +0000 Subject: [PATCH 07/43] Update dependencies from https://github.com/dotnet/sdk build 20230111.44 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23061.44 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (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 b1e919104..da9fca008 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 + 03336daeccdb35c6ff09384e00ad4cc3e49b8323 - + https://github.com/dotnet/sdk - ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 + 03336daeccdb35c6ff09384e00ad4cc3e49b8323 - + https://github.com/dotnet/sdk - ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 + 03336daeccdb35c6ff09384e00ad4cc3e49b8323 - + https://github.com/dotnet/sdk - ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 + 03336daeccdb35c6ff09384e00ad4cc3e49b8323 diff --git a/eng/Versions.props b/eng/Versions.props index b3cc36385..1a72807f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23061.40 - 7.0.200-preview.23061.40 - 7.0.200-preview.23061.40 + 7.0.200-preview.23061.44 + 7.0.200-preview.23061.44 + 7.0.200-preview.23061.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e216c822d42f6bfa3c0454160a90be9112abd5c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 17:45:18 +0000 Subject: [PATCH 08/43] Update dependencies from https://github.com/dotnet/sdk build 20230112.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.3 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (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 da9fca008..5c027e560 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 03336daeccdb35c6ff09384e00ad4cc3e49b8323 + bbc0390753596357eb32e64d286c2e13c7db9b10 - + https://github.com/dotnet/sdk - 03336daeccdb35c6ff09384e00ad4cc3e49b8323 + bbc0390753596357eb32e64d286c2e13c7db9b10 - + https://github.com/dotnet/sdk - 03336daeccdb35c6ff09384e00ad4cc3e49b8323 + bbc0390753596357eb32e64d286c2e13c7db9b10 - + https://github.com/dotnet/sdk - 03336daeccdb35c6ff09384e00ad4cc3e49b8323 + bbc0390753596357eb32e64d286c2e13c7db9b10 diff --git a/eng/Versions.props b/eng/Versions.props index 1a72807f6..f5857d80f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23061.44 - 7.0.200-preview.23061.44 - 7.0.200-preview.23061.44 + 7.0.200-preview.23062.3 + 7.0.200-preview.23062.3 + 7.0.200-preview.23062.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e441d9346cde48a3c66d1f350400673a95279490 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 19:04:08 +0000 Subject: [PATCH 09/43] Update dependencies from https://github.com/dotnet/sdk build 20230112.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.5 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (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 5c027e560..f45181138 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - bbc0390753596357eb32e64d286c2e13c7db9b10 + 66df4df0bb20880b8b05c2561f2c359bd51adbd4 - + https://github.com/dotnet/sdk - bbc0390753596357eb32e64d286c2e13c7db9b10 + 66df4df0bb20880b8b05c2561f2c359bd51adbd4 - + https://github.com/dotnet/sdk - bbc0390753596357eb32e64d286c2e13c7db9b10 + 66df4df0bb20880b8b05c2561f2c359bd51adbd4 - + https://github.com/dotnet/sdk - bbc0390753596357eb32e64d286c2e13c7db9b10 + 66df4df0bb20880b8b05c2561f2c359bd51adbd4 diff --git a/eng/Versions.props b/eng/Versions.props index f5857d80f..21402f4d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.3 - 7.0.200-preview.23062.3 - 7.0.200-preview.23062.3 + 7.0.200-preview.23062.5 + 7.0.200-preview.23062.5 + 7.0.200-preview.23062.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ab538d4fd200cd7280ee85b02670c7fceb1ddaae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 21:20:30 +0000 Subject: [PATCH 10/43] Update dependencies from https://github.com/dotnet/sdk build 20230112.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.9 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (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 f45181138..891161048 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 66df4df0bb20880b8b05c2561f2c359bd51adbd4 + 21eb0272e92284189614cb2a9cf7315503d062be - + https://github.com/dotnet/sdk - 66df4df0bb20880b8b05c2561f2c359bd51adbd4 + 21eb0272e92284189614cb2a9cf7315503d062be - + https://github.com/dotnet/sdk - 66df4df0bb20880b8b05c2561f2c359bd51adbd4 + 21eb0272e92284189614cb2a9cf7315503d062be - + https://github.com/dotnet/sdk - 66df4df0bb20880b8b05c2561f2c359bd51adbd4 + 21eb0272e92284189614cb2a9cf7315503d062be diff --git a/eng/Versions.props b/eng/Versions.props index 21402f4d1..b7e6615a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.5 - 7.0.200-preview.23062.5 - 7.0.200-preview.23062.5 + 7.0.200-preview.23062.9 + 7.0.200-preview.23062.9 + 7.0.200-preview.23062.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 82f25c9509c452db9f269ca5e15a1d661bb8dea8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 22:40:38 +0000 Subject: [PATCH 11/43] Update dependencies from https://github.com/dotnet/sdk build 20230112.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.10 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (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 891161048..7f2b1bb9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 21eb0272e92284189614cb2a9cf7315503d062be + 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 - + https://github.com/dotnet/sdk - 21eb0272e92284189614cb2a9cf7315503d062be + 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 - + https://github.com/dotnet/sdk - 21eb0272e92284189614cb2a9cf7315503d062be + 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 - + https://github.com/dotnet/sdk - 21eb0272e92284189614cb2a9cf7315503d062be + 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 @@ -138,9 +138,9 @@ be79eb4393631df7c6431ed1c0aa14c1bbaca731 - + https://github.com/dotnet/linker - 8db10f44053ed4cb95a99676ac7b8ccae681b79d + 19fa656d35252ccf926e6a6d783b16a2f094aaef linker diff --git a/eng/Versions.props b/eng/Versions.props index b7e6615a3..f752fe129 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.9 - 7.0.200-preview.23062.9 - 7.0.200-preview.23062.9 + 7.0.200-preview.23062.10 + 7.0.200-preview.23062.10 + 7.0.200-preview.23062.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1eb3d97259a71cdeddaf8c756ed508a8e7316203 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 23:57:00 +0000 Subject: [PATCH 12/43] Update dependencies from https://github.com/dotnet/sdk build 20230112.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.16 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (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 7f2b1bb9e..497bc78ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 + 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 - + https://github.com/dotnet/sdk - 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 + 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 - + https://github.com/dotnet/sdk - 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 + 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 - + https://github.com/dotnet/sdk - 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 + 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 diff --git a/eng/Versions.props b/eng/Versions.props index f752fe129..9bbe7bcb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.10 - 7.0.200-preview.23062.10 - 7.0.200-preview.23062.10 + 7.0.200-preview.23062.16 + 7.0.200-preview.23062.16 + 7.0.200-preview.23062.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d6f80c92c911395a353ddeebbd778c584cd22bd4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Jan 2023 05:11:31 +0000 Subject: [PATCH 13/43] Update dependencies from https://github.com/dotnet/sdk build 20230112.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.25 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (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 497bc78ad..cce8b62d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 + 28ad007682ca03e88375a4e85465e18bb365fe5b - + https://github.com/dotnet/sdk - 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 + 28ad007682ca03e88375a4e85465e18bb365fe5b - + https://github.com/dotnet/sdk - 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 + 28ad007682ca03e88375a4e85465e18bb365fe5b - + https://github.com/dotnet/sdk - 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 + 28ad007682ca03e88375a4e85465e18bb365fe5b diff --git a/eng/Versions.props b/eng/Versions.props index 9bbe7bcb4..8698406fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.16 - 7.0.200-preview.23062.16 - 7.0.200-preview.23062.16 + 7.0.200-preview.23062.25 + 7.0.200-preview.23062.25 + 7.0.200-preview.23062.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e61ed353ea9af93d88207d43e66f903159022b38 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Jan 2023 10:19:56 +0000 Subject: [PATCH 14/43] Update dependencies from https://github.com/dotnet/sdk build 20230112.35 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.35 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23062.3 (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 cce8b62d6..55bce1024 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 28ad007682ca03e88375a4e85465e18bb365fe5b + db99dbac0861ce9aeced6182d5ca62cecbce3e78 - + https://github.com/dotnet/sdk - 28ad007682ca03e88375a4e85465e18bb365fe5b + db99dbac0861ce9aeced6182d5ca62cecbce3e78 - + https://github.com/dotnet/sdk - 28ad007682ca03e88375a4e85465e18bb365fe5b + db99dbac0861ce9aeced6182d5ca62cecbce3e78 - + https://github.com/dotnet/sdk - 28ad007682ca03e88375a4e85465e18bb365fe5b + db99dbac0861ce9aeced6182d5ca62cecbce3e78 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 1607c540c369f9ae32a48dd72e7952148b084a2a + 9abb456f29f254da028126cb09ad10751a01eebf - + https://github.com/dotnet/fsharp - 1607c540c369f9ae32a48dd72e7952148b084a2a + 9abb456f29f254da028126cb09ad10751a01eebf diff --git a/eng/Versions.props b/eng/Versions.props index 8698406fb..0935a692f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.25 - 7.0.200-preview.23062.25 - 7.0.200-preview.23062.25 + 7.0.200-preview.23062.35 + 7.0.200-preview.23062.35 + 7.0.200-preview.23062.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 90a0a9becefb3c3e05f4ff2910b906b0242b345d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Jan 2023 11:46:11 +0000 Subject: [PATCH 15/43] Update dependencies from https://github.com/dotnet/sdk build 20230113.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23063.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23062.3 (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 55bce1024..1c004b66f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - db99dbac0861ce9aeced6182d5ca62cecbce3e78 + 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 - + https://github.com/dotnet/sdk - db99dbac0861ce9aeced6182d5ca62cecbce3e78 + 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 - + https://github.com/dotnet/sdk - db99dbac0861ce9aeced6182d5ca62cecbce3e78 + 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 - + https://github.com/dotnet/sdk - db99dbac0861ce9aeced6182d5ca62cecbce3e78 + 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 diff --git a/eng/Versions.props b/eng/Versions.props index 0935a692f..836a41d7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.35 - 7.0.200-preview.23062.35 - 7.0.200-preview.23062.35 + 7.0.200-preview.23063.2 + 7.0.200-preview.23063.2 + 7.0.200-preview.23063.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 87d18781bc811664ede0aa0f28918ec47ae92257 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 13 Jan 2023 15:22:57 +0000 Subject: [PATCH 16/43] Update sdk version used to build source-build --- src/SourceBuild/tarball/content/global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 1bf480e4e..01432c896 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100" + "dotnet": "7.0.102" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From b8e7c828f7439a4ca7783425675bab33cf90e238 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Jan 2023 18:04:03 +0000 Subject: [PATCH 17/43] Update dependencies from https://github.com/dotnet/sdk build 20230113.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23063.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23062.3 (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 1c004b66f..3eadeab0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 + 9acbc4db3fa18e9839189580622be7258f81c9d5 - + https://github.com/dotnet/sdk - 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 + 9acbc4db3fa18e9839189580622be7258f81c9d5 - + https://github.com/dotnet/sdk - 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 + 9acbc4db3fa18e9839189580622be7258f81c9d5 - + https://github.com/dotnet/sdk - 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 + 9acbc4db3fa18e9839189580622be7258f81c9d5 diff --git a/eng/Versions.props b/eng/Versions.props index 836a41d7d..79b8fe7f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23063.2 - 7.0.200-preview.23063.2 - 7.0.200-preview.23063.2 + 7.0.200-preview.23063.9 + 7.0.200-preview.23063.9 + 7.0.200-preview.23063.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 55be7a1a68f6890836eb0b85b0a39a0eeb1c5b4f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 13 Jan 2023 15:43:08 -0800 Subject: [PATCH 18/43] Stable branding for 7.0.2xx GA --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8b3a57153..9b5a4f514 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,13 +10,13 @@ 2 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - preview + rtm $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release From 8fd65d532ef21cac4c66b2c6edde7fdfa9dff1ac Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 13 Jan 2023 15:44:57 -0800 Subject: [PATCH 19/43] Update implicit versions --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 14f9bc796..391078d3c 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -63,7 +63,7 @@ 30 32 17 - 12 + $([MSBuild]::Add($(VersionFeature), 14)) From 067f0fc228989cab9ab1fae46e3beb841c8c7d28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Jan 2023 00:45:09 +0000 Subject: [PATCH 20/43] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230113.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22608.2 -> To Version 7.0.0-alpha.1.23063.1 --- NuGet.config | 10 ---------- eng/Version.Details.xml | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8ca01d0f3..0f076a132 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,23 +7,17 @@ - - - - - - @@ -45,15 +39,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8bb541249..259ae5e94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,7 +207,7 @@ https://github.com/dotnet/arcade ac5977ebf05451c1adcf24a15d16263e4d25fd0c - + https://github.com/dotnet/source-build-reference-packages 9964206e0dd215eee4ed199b9041a94e16ba4c45 From b6530bdf354b603033d0e0b06ef9e34cc7d890ce Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Tue, 17 Jan 2023 13:40:03 -0800 Subject: [PATCH 21/43] Disable source-build tarball build in CI --- .vsts-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index eb2acb8c9..266784afc 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -334,10 +334,11 @@ stages: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - dependsOn: Source_Build_Create_Tarball + # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches. + # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + # parameters: + # dependsOn: Source_Build_Create_Tarball # https://github.com/dotnet/core-sdk/issues/248 # - template: /eng/build.yml From 4192499940b50c28e93fe5db77f5323d98da1134 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 17 Jan 2023 14:52:01 -0800 Subject: [PATCH 22/43] .NET Source-Build 7.0.102 January 2023 Updates (#15251) Co-authored-by: Chris Rummel Co-authored-by: Michael Simons --- eng/Versions.props | 2 +- .../job/source-build-run-tarball-build.yml | 10 +-- .../tarball/content/Directory.Build.props | 4 ++ .../bootstrap/OverrideBootstrapVersions.props | 4 ++ .../buildBootstrapPreviouslySB.csproj | 70 +++++++++++++------ src/SourceBuild/tarball/content/global.json | 2 +- .../source-build-reference-packages.proj | 2 + 7 files changed, 66 insertions(+), 28 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7fb285690..c5ab2374a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.100 + 7.0.102-4 diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 06bfd2b15..5459e8415 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -36,32 +36,32 @@ jobs: installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: CentOSStream8-Online: - _BootstrapPrep: false + _BootstrapPrep: true _Container: ${{ parameters.centOSStream8Container }} _EnablePoison: false _ExcludeOmniSharpTests: true _RunOnline: true CentOSStream8-Offline: - _BootstrapPrep: false + _BootstrapPrep: true _Container: ${{ parameters.centOSStream8Container }} _EnablePoison: false _ExcludeOmniSharpTests: true _RunOnline: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: CentOSStream9-Offline: - _BootstrapPrep: false + _BootstrapPrep: true _Container: ${{ parameters.centOSStream9Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false Fedora36-Offline: - _BootstrapPrep: false + _BootstrapPrep: true _Container: ${{ parameters.fedora36Container }} _EnablePoison: true _ExcludeOmniSharpTests: false _RunOnline: false Ubuntu2004-Offline: - _BootstrapPrep: false + _BootstrapPrep: true _Container: ${{ parameters.ubuntu2004Container }} _EnablePoison: false _ExcludeOmniSharpTests: false diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 8880b5d05..6ca72bb7a 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -236,6 +236,10 @@ + + + + diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props index d0a05029f..ced02e960 100644 --- a/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props +++ b/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props @@ -7,5 +7,9 @@ $(NonshippingRuntimeVersionFor700) $(NonshippingRuntimeVersionFor700) $(NonshippingRuntimeVersionFor700) + + 7.0.0 + 7.0.0 + 7.0.0 diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj index a22d70373..4f2bbd079 100644 --- a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj +++ b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj @@ -13,36 +13,40 @@ - + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -73,6 +77,30 @@ Targets="CopyDownloadedPackage" Properties="SourcePath=$(RestorePackagesPath);DestinationPath=$(UnpackedTarPath);PackageName=%(PackageDownload.Identity);PackageVersion=%(PackageDownload.Version)" /> + + + + + + + + + + + + + + + + + + diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 1bf480e4e..01432c896 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100" + "dotnet": "7.0.102" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj b/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj index c1321e716..9f7c3853c 100644 --- a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj +++ b/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj @@ -16,6 +16,8 @@ true + + NU1504 From 33ef3b27ee7a70e3ca8b0dbf63111ad6c2d36793 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 7 Feb 2023 15:01:58 -0800 Subject: [PATCH 23/43] Update branding to 7.0.201 (#15465) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4b1d59f38..6ffd9de52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 2 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) rtm From f1da1277032f4d5321087a1dc7e357d6ae22b35d Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 8 Feb 2023 00:16:13 +0100 Subject: [PATCH 24/43] [automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15322) Co-authored-by: Michael Simons Co-authored-by: Logan Bussell Co-authored-by: Jason Zhai --- eng/Versions.props | 1 + .../job/source-build-build-tarball.yml | 29 +++++++++++++++++++ .../job/source-build-run-tarball-build.yml | 14 +++++++++ .../pipelines/security-partners-dotnet.yml | 1 + .../source-build-reference-packages.proj | 2 -- 5 files changed, 45 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6ffd9de52..2e5be79b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,6 +193,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> + 7.0.102 7.0.102-4 diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index 9ae170d1c..9e67adb4d 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -101,6 +101,35 @@ jobs: Contents: '*.tar.gz' TargetFolder: $(tarballDir)/packages/archive/ + - script: | + set -euo pipefail + + sourceBuiltSDKUrl="https://dotnetcli.azureedge.net/source-built-artifacts/sdks/" + packageVersionsPath="$(Build.SourcesDirectory)/eng/Versions.props" + notFoundMessage="No source-built SDK found to download..." + + echo "Looking for source-built SDK to download..." + archiveVersionLine=`grep -m 1 "" "$packageVersionsPath" || :` + versionPattern="(.*)" + + if [[ $archiveVersionLine =~ $versionPattern ]]; then + filename="dotnet-sdk-${BASH_REMATCH[1]}-centos.8-x64.tar.gz" + archiveUrl="${sourceBuiltSDKUrl}${filename}" + downloadDir=$(mktemp -d) + (cd $downloadDir && curl --retry 5 -O $archiveUrl) + + mkdir $(tarballDir)/.dotnet + tar -xzf $downloadDir/$filename -C $(tarballDir)/.dotnet + rm -rf $downloadDir + else + echo "$notFoundMessage" + exit 1 + fi + + echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /tarball/.dotnet" + displayName: Setup Previously Source-Built SDK + condition: eq(variables._WithPreviousSDK, 'true') + - script: | set -x diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 5459e8415..efa1ff1af 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -41,31 +41,43 @@ jobs: _EnablePoison: false _ExcludeOmniSharpTests: true _RunOnline: true + _WithPreviousSDK: false CentOSStream8-Offline: _BootstrapPrep: true _Container: ${{ parameters.centOSStream8Container }} _EnablePoison: false _ExcludeOmniSharpTests: true _RunOnline: false + _WithPreviousSDK: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + CentOSStream8-WithPreviousSDK: + _BootstrapPrep: false + _Container: ${{ parameters.centOSStream8Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _RunOnline: false + _WithPreviousSDK: true CentOSStream9-Offline: _BootstrapPrep: true _Container: ${{ parameters.centOSStream9Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false + _WithPreviousSDK: false Fedora36-Offline: _BootstrapPrep: true _Container: ${{ parameters.fedora36Container }} _EnablePoison: true _ExcludeOmniSharpTests: false _RunOnline: false + _WithPreviousSDK: false Ubuntu2004-Offline: _BootstrapPrep: true _Container: ${{ parameters.ubuntu2004Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false + _WithPreviousSDK: false name: Build_Tarball_x64 pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: @@ -89,6 +101,7 @@ jobs: _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false + _WithPreviousSDK: false name: Build_Tarball_arm64 pool: ${{ parameters.poolInternalArm64 }} @@ -109,6 +122,7 @@ jobs: _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false + _WithPreviousSDK: false name: Build_Tarball_x64_Using_Previous pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index 69bef21e9..6200e7fc0 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -12,6 +12,7 @@ jobs: _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false + _WithPreviousSDK: false name: Build_Tarball_x64 pool: name: NetCore1ESPool-Svc-Internal diff --git a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj b/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj index 9f7c3853c..c1321e716 100644 --- a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj +++ b/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj @@ -16,8 +16,6 @@ true - - NU1504 From a50f7c19b3add0d0474774654604cae8ba609bdb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Feb 2023 07:08:12 +0000 Subject: [PATCH 25/43] Update dependencies from https://github.com/dotnet/sdk build 20230207.47 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23107.31 -> To Version 7.0.300-preview.23107.47 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23107-03 -> To Version 17.6.0-preview-23108-01 (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 f9d984655..beeca8362 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 7cf2971bbbb10e81befb250c13b7e8be3ccf2ae6 + ad096f173ce6922b9217bb277e74a36a4d3730be - + https://github.com/dotnet/sdk - 7cf2971bbbb10e81befb250c13b7e8be3ccf2ae6 + ad096f173ce6922b9217bb277e74a36a4d3730be - + https://github.com/dotnet/sdk - 7cf2971bbbb10e81befb250c13b7e8be3ccf2ae6 + ad096f173ce6922b9217bb277e74a36a4d3730be - + https://github.com/dotnet/sdk - 7cf2971bbbb10e81befb250c13b7e8be3ccf2ae6 + ad096f173ce6922b9217bb277e74a36a4d3730be @@ -149,9 +149,9 @@ 8da03f9cd0471db81cea9a5d7f7f92d3a746c6de - + https://github.com/dotnet/msbuild - 446f42e6d1478acb44faec787f90f57f38c08b73 + c3541c6a284e10eacd615e2f9568c9f484a0b417 diff --git a/eng/Versions.props b/eng/Versions.props index 1c824753c..e88bf449f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23107.31 - 7.0.300-preview.23107.31 - 7.0.300-preview.23107.31 + 7.0.300-preview.23107.47 + 7.0.300-preview.23107.47 + 7.0.300-preview.23107.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b26aedc19d5c3f002c16ce0e875124b5b782e8bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Feb 2023 00:19:49 +0000 Subject: [PATCH 26/43] Update dependencies from https://github.com/dotnet/sdk build 20230208.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23107.47 -> To Version 7.0.300-preview.23108.34 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23106.7 -> To Version 12.5.0-beta.23108.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 8 ++++---- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index beeca8362..0165258b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - ad096f173ce6922b9217bb277e74a36a4d3730be + 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 - + https://github.com/dotnet/sdk - ad096f173ce6922b9217bb277e74a36a4d3730be + 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 - + https://github.com/dotnet/sdk - ad096f173ce6922b9217bb277e74a36a4d3730be + 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 - + https://github.com/dotnet/sdk - ad096f173ce6922b9217bb277e74a36a4d3730be + 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 @@ -124,18 +124,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 6e280448367a288c6d28d9c0a446302c4fb90e3f + 2d21a15e1b23ab18ff2e57c0f2ec82fb0011e6aa - + https://github.com/dotnet/fsharp - 6e280448367a288c6d28d9c0a446302c4fb90e3f + 2d21a15e1b23ab18ff2e57c0f2ec82fb0011e6aa - + https://github.com/microsoft/vstest - 85d67695a7a01397501216d54eec979d7d296bdb + f119868280da3cea22db8e6f85d24252f605db4c @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - 8da03f9cd0471db81cea9a5d7f7f92d3a746c6de + 50bd09a9eefdf9bc3653dbf6d9624b31a023c7c0 - + https://github.com/dotnet/msbuild - c3541c6a284e10eacd615e2f9568c9f484a0b417 + 51df47643a8ee2715ac67fab8d652b25be070cd2 diff --git a/eng/Versions.props b/eng/Versions.props index e88bf449f..27dbee468 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23107.47 - 7.0.300-preview.23107.47 - 7.0.300-preview.23107.47 + 7.0.300-preview.23108.34 + 7.0.300-preview.23108.34 + 7.0.300-preview.23108.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230206-01 + 17.6.0-preview-20230208-02 From 0d4b7ea4959f2392c3c014da135456bd693b818c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 02:13:09 +0000 Subject: [PATCH 27/43] [release/7.0.3xx] Update dependencies from dotnet/arcade (#15486) [release/7.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++-- eng/Versions.props | 2 +- eng/common/generate-locproject.ps1 | 48 ++++++++++++++- eng/common/loc/P22DotNetHtmlLocalization.lss | Bin 0 -> 3810 bytes eng/common/templates/job/execute-sdl.yml | 3 +- eng/common/templates/job/onelocbuild.yml | 43 +++++++------ .../templates/job/publish-build-assets.yml | 14 ++++- eng/common/templates/job/source-build.yml | 7 ++- .../templates/job/source-index-stage1.yml | 5 +- eng/common/templates/jobs/jobs.yml | 9 --- .../templates/post-build/post-build.yml | 12 ++-- .../templates/variables/pool-providers.yml | 57 ++++++++++++++++++ global.json | 4 +- 13 files changed, 163 insertions(+), 53 deletions(-) create mode 100644 eng/common/loc/P22DotNetHtmlLocalization.lss create mode 100644 eng/common/templates/variables/pool-providers.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0165258b0..10217eb14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 5f8519337c864af63b8692754ca0fa971bfc55d4 + 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 - + https://github.com/dotnet/arcade - 5f8519337c864af63b8692754ca0fa971bfc55d4 + 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 - + https://github.com/dotnet/arcade - 5f8519337c864af63b8692754ca0fa971bfc55d4 + 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 27dbee468..5464d7f6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.23073.6 + 7.0.0-beta.23108.1 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index bab18543d..bcb579e37 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -34,6 +34,25 @@ $jsonTemplateFiles | ForEach-Object { $jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern $wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them +if (-not $wxlFiles) { + $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files + if ($wxlEnFiles) { + $wxlFiles = @() + $wxlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru + } + } +} + +$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files +$macosHtmlFiles = @() +if ($macosHtmlEnFiles) { + $macosHtmlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru + } +} $xlfFiles = @() @@ -91,6 +110,7 @@ $locJson = @{ ) }, @{ + LanguageSet = $LanguageSet CloneLanguageSet = "WiX_CloneLanguages" LssFiles = @( "wxl_loc.lss" ) LocItems = @( @@ -98,8 +118,7 @@ $locJson = @{ $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { - if ($_.FullName.Contains($exclusion)) - { + if ($_.FullName.Contains($exclusion)) { $continue = $false } } @@ -110,7 +129,30 @@ $locJson = @{ SourceFile = $sourceFile CopyOption = "LangIDOnPath" OutputPath = $outputPath - Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW" + } + } + } + ) + }, + @{ + LanguageSet = $LanguageSet + CloneLanguageSet = "VS_macOS_CloneLanguages" + LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" ) + LocItems = @( + $macosHtmlFiles | ForEach-Object { + $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($_.FullName.Contains($exclusion)) { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if ($continue) { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = $outputPath } } } diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss new file mode 100644 index 0000000000000000000000000000000000000000..6661fed566e49b0c206665bc21f135e06c9b89c4 GIT binary patch literal 3810 zcmd^CT~8BH5S?ce|HG9Bo&v?0;P_m6l= znU-wb=}VLT7UH{>{5H;0M4iLmRE8QeBRr|>&k=uV*L;heKY+dq>B$0^=0I}|x`)s{ zht4t9zaiEh5Fe>E-;zVT;c4G?v;9N0G=rWwo~*(Cs`OS6ZL`HL;vsL0J@I%$+0YvE zx{9ukK|FtFx1PlPD5M;6ZM>f;1BhCf?`8y6QH*?RT9T>XwF z#~m_N+i^UKE^j{e;KdNW`kH9Rbj{G8tDY}mafCgG+m3H`I@_PhrDmcIzxD&IX@s083kV|lLUE^0(h6wWRPN0QN1n^PU5eX8r6OZ*s^g)tt77#SZCB}znxye#U$Dtinr6lnVu z!LzA{A}0~no7p$thFGJAnI}oSW||9H=Bz}I7kD#2MLg7WfrlE5o9sQjePc>qmv+6iQCmdp(y}(Vr literal 0 HcmV?d00001 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index aaeb83b4d..7c164ac02 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -46,6 +46,7 @@ jobs: - template: /eng/common/templates/variables/sdl-variables.yml - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} + - template: /eng/common/templates/variables/pool-providers.yml pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: @@ -53,7 +54,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - checkout: self diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 6b8fc9970..60ab00c4d 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -14,6 +14,7 @@ parameters: ReusePr: true UseLfLineEndings: true UseCheckedInLocProjectJson: false + SkipLocProjectJsonGeneration: false LanguageSet: VS_Main_Languages LclSource: lclFilesInRepo LclPackageId: '' @@ -22,13 +23,25 @@ parameters: MirrorRepo: '' MirrorBranch: main condition: '' + JobNameSuffix: '' jobs: -- job: OneLocBuild +- job: OneLocBuild${{ parameters.JobNameSuffix }} dependsOn: ${{ parameters.dependsOn }} - displayName: OneLocBuild + displayName: OneLocBuild${{ parameters.JobNameSuffix }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + - template: /eng/common/templates/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: pool: ${{ parameters.pool }} @@ -40,27 +53,17 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 - variables: - - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat - - name: _GenerateLocProjectArguments - value: -SourcesDirectory ${{ parameters.SourcesDirectory }} - -LanguageSet "${{ parameters.LanguageSet }}" - -CreateNeutralXlfs - - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: - - name: _GenerateLocProjectArguments - value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson - - steps: - - task: Powershell@2 - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 - arguments: $(_GenerateLocProjectArguments) - displayName: Generate LocProject.json - condition: ${{ parameters.condition }} + - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} - task: OneLocBuild@2 displayName: OneLocBuild diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 1cbb6a0c5..c5fedd7f7 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -34,15 +34,15 @@ jobs: - job: Asset_Registry_Publish dependsOn: ${{ parameters.dependsOn }} + timeoutInMinutes: 150 ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: displayName: Publish Assets ${{ else }}: displayName: Publish to Build Asset Registry - pool: ${{ parameters.pool }} - variables: + - template: /eng/common/templates/variables/pool-providers.yml - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: Publish-Build-Assets - group: AzureDevOps-Artifact-Feeds-Pats @@ -51,6 +51,16 @@ jobs: - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - template: /eng/common/templates/post-build/common-variables.yml + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: VSEngSS-MicroBuild2022-1ES + demands: Cmd + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2019.amd64 + steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: DownloadBuildArtifacts@0 diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index b6137f44a..8a3deef2b 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -44,13 +44,16 @@ jobs: ${{ if eq(parameters.platform.pool, '') }}: # The default VM host AzDO pool. This should be capable of running Docker containers: almost all # source-build builds run in Docker, including the default managed platform. + # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 59a42c338..09c506d11 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -22,16 +22,17 @@ jobs: value: ${{ parameters.binlogPath }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: source-dot-net stage1 variables + - template: /eng/common/templates/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: pool: ${{ parameters.pool }} ${{ if eq(parameters.pool, '') }}: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public + name: $(DncEngPublicBuildPool) demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 297e7946b..289bb2396 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -88,15 +88,6 @@ jobs: - ${{ job.job }} - ${{ if eq(parameters.enableSourceBuild, true) }}: - Source_Build_Complete - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 957375c1c..c051f1b65 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -95,6 +95,7 @@ stages: displayName: Validate Build Assets variables: - template: common-variables.yml + - template: /eng/common/templates/variables/pool-providers.yml jobs: - job: displayName: NuGet Validation @@ -106,7 +107,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: @@ -143,7 +144,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -203,7 +204,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -251,6 +252,7 @@ stages: displayName: Publish using Darc variables: - template: common-variables.yml + - template: /eng/common/templates/variables/pool-providers.yml jobs: - job: displayName: Publish Using Darc @@ -262,7 +264,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -282,4 +284,4 @@ stages: -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml new file mode 100644 index 000000000..99c80212b --- /dev/null +++ b/eng/common/templates/variables/pool-providers.yml @@ -0,0 +1,57 @@ +# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. + +# Motivation: +# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS +# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing +# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS) +# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services +# team needs to move resources around and create new and potentially differently-named pools. Using this template +# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. + +# How to use: +# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). +# If we find alternate naming conventions in broad usage these can be added to the condition below. +# +# First, import the template in an arcade-ified repo to pick up the variables, e.g.: +# +# variables: +# - template: /eng/common/templates/variables/pool-providers.yml +# +# ... then anywhere specifying the pool provider use the runtime variables, +# $(DncEngInternalBuildPool) and $ (DncEngPublicBuildPool), e.g.: +# +# pool: +# name: $(DncEngInternalBuildPool) +# demands: ImageOverride -equals windows.vs2019.amd64 + +variables: + # Coalesce the target and source branches so we know when a PR targets a release branch + # If these variables are somehow missing, fall back to main (tends to have more capacity) + + # Any new -Svc alternative pools should have variables added here to allow for splitting work + - name: DncEngPublicBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore-Svc-Public' + ), + False, + 'NetCore-Public' + ) + ] + + - name: DncEngInternalBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore1ESPool-Svc-Internal' + ), + False, + 'NetCore1ESPool-Internal' + ) + ] \ No newline at end of file diff --git a/global.json b/global.json index 0d15a2c1f..40e2f263c 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23073.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23073.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23108.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23108.1" } } From cec8d235e1de0a050a59e291c35f785121e82b00 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Feb 2023 04:30:26 +0000 Subject: [PATCH 28/43] Update dependencies from https://github.com/dotnet/sdk build 20230208.40 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23108.34 -> To Version 7.0.300-preview.23108.40 --- 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 10217eb14..c20033102 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 + 31945c5e5c1e85e289efd3d222fd9f76b42a3293 - + https://github.com/dotnet/sdk - 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 + 31945c5e5c1e85e289efd3d222fd9f76b42a3293 - + https://github.com/dotnet/sdk - 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 + 31945c5e5c1e85e289efd3d222fd9f76b42a3293 - + https://github.com/dotnet/sdk - 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 + 31945c5e5c1e85e289efd3d222fd9f76b42a3293 diff --git a/eng/Versions.props b/eng/Versions.props index 5464d7f6a..398caf899 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23108.34 - 7.0.300-preview.23108.34 - 7.0.300-preview.23108.34 + 7.0.300-preview.23108.40 + 7.0.300-preview.23108.40 + 7.0.300-preview.23108.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2b9f6c2591531d9ea4771a5f3795660d48e18ae2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 14:14:25 -0800 Subject: [PATCH 29/43] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15502) Co-authored-by: dotnet-maestro[bot] --- 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 c20033102..a127c62c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 31945c5e5c1e85e289efd3d222fd9f76b42a3293 + f42306939dc8f93312e5d9ab8718d64d0536e6a7 - + https://github.com/dotnet/sdk - 31945c5e5c1e85e289efd3d222fd9f76b42a3293 + f42306939dc8f93312e5d9ab8718d64d0536e6a7 - + https://github.com/dotnet/sdk - 31945c5e5c1e85e289efd3d222fd9f76b42a3293 + f42306939dc8f93312e5d9ab8718d64d0536e6a7 - + https://github.com/dotnet/sdk - 31945c5e5c1e85e289efd3d222fd9f76b42a3293 + f42306939dc8f93312e5d9ab8718d64d0536e6a7 @@ -133,9 +133,9 @@ 2d21a15e1b23ab18ff2e57c0f2ec82fb0011e6aa - + https://github.com/microsoft/vstest - f119868280da3cea22db8e6f85d24252f605db4c + d104dca228e7e71ec5bf4119b8ef0ed3e8ebb3e8 diff --git a/eng/Versions.props b/eng/Versions.props index 454395ce3..dc445dccc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23108.40 - 7.0.300-preview.23108.40 - 7.0.300-preview.23108.40 + 7.0.300-preview.23109.8 + 7.0.300-preview.23109.8 + 7.0.300-preview.23109.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230208-02 + 17.6.0-preview-20230209-01 From b3789cb0af2035280ee9f1272bb6069fd388f16f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Feb 2023 04:02:48 +0000 Subject: [PATCH 30/43] Update dependencies from https://github.com/dotnet/sdk build 20230209.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23109.8 -> To Version 7.0.300-preview.23109.17 Dependency coherency updates NuGet.Build.Tasks From Version 6.5.0-preview.3.136 -> To Version 6.6.0-preview.2.19 (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 a127c62c6..35faafb66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - f42306939dc8f93312e5d9ab8718d64d0536e6a7 + 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 - + https://github.com/dotnet/sdk - f42306939dc8f93312e5d9ab8718d64d0536e6a7 + 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 - + https://github.com/dotnet/sdk - f42306939dc8f93312e5d9ab8718d64d0536e6a7 + 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 - + https://github.com/dotnet/sdk - f42306939dc8f93312e5d9ab8718d64d0536e6a7 + 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 @@ -154,9 +154,9 @@ 51df47643a8ee2715ac67fab8d652b25be070cd2 - + https://github.com/nuget/nuget.client - 743503cb3c7e9ced2602ee2e29c38d63cc339451 + 8dec976a1ae4f80c82b3007cd8a5c80bdc8f3b22 diff --git a/eng/Versions.props b/eng/Versions.props index dc445dccc..6ee820262 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23109.8 - 7.0.300-preview.23109.8 - 7.0.300-preview.23109.8 + 7.0.300-preview.23109.17 + 7.0.300-preview.23109.17 + 7.0.300-preview.23109.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 942fb3b51e3c92ee10a3279e12514c9e30eda25a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Feb 2023 09:07:52 +0000 Subject: [PATCH 31/43] Update dependencies from https://github.com/dotnet/sdk build 20230209.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23109.17 -> To Version 7.0.300-preview.23109.26 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-1.23107.10 -> To Version 4.6.0-1.23109.10 (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 35faafb66..6cce43f33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 + 10095975bc381f67b4321c275d057d401f11d2dd - + https://github.com/dotnet/sdk - 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 + 10095975bc381f67b4321c275d057d401f11d2dd - + https://github.com/dotnet/sdk - 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 + 10095975bc381f67b4321c275d057d401f11d2dd - + https://github.com/dotnet/sdk - 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 + 10095975bc381f67b4321c275d057d401f11d2dd @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 50bd09a9eefdf9bc3653dbf6d9624b31a023c7c0 + 73338d92270b9f26982eca2e8872037a0214b912 diff --git a/eng/Versions.props b/eng/Versions.props index 6ee820262..f4ecd0fe6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23109.17 - 7.0.300-preview.23109.17 - 7.0.300-preview.23109.17 + 7.0.300-preview.23109.26 + 7.0.300-preview.23109.26 + 7.0.300-preview.23109.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 702bf607ccbb1a5a860bbbedc06a31bbd393e8da Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Sat, 11 Feb 2023 00:49:21 +0100 Subject: [PATCH 32/43] [automated] Merge branch 'release/7.0.2xx' => 'release/7.0.3xx' (#15506) Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai Co-authored-by: Matt Mitchell Co-authored-by: Michael Simons --- eng/AfterSigning.targets | 24 ++++++++++++++++++++++++ src/redist/redist.csproj | 1 - 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 eng/AfterSigning.targets diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets new file mode 100644 index 000000000..b8a08378a --- /dev/null +++ b/eng/AfterSigning.targets @@ -0,0 +1,24 @@ + + + <_SuppressSdkImports>false + + + + + + + + + + + + + %(FullPath).sha512 + + + + + + diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index d9b868ecc..554b1b1ee 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -47,5 +47,4 @@ - From 691ac162a03a5fc9b5b580010bbc5ae3609bc20c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 23:58:39 +0000 Subject: [PATCH 33/43] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15510) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230209-01 to 17.6.0-preview-20230210-01 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.6.0-preview-23108-10 to 17.6.0-preview-23110-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cce43f33..d2fa98b93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 10095975bc381f67b4321c275d057d401f11d2dd + 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 - + https://github.com/dotnet/sdk - 10095975bc381f67b4321c275d057d401f11d2dd + 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 - + https://github.com/dotnet/sdk - 10095975bc381f67b4321c275d057d401f11d2dd + 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 - + https://github.com/dotnet/sdk - 10095975bc381f67b4321c275d057d401f11d2dd + 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 @@ -133,9 +133,9 @@ 2d21a15e1b23ab18ff2e57c0f2ec82fb0011e6aa - + https://github.com/microsoft/vstest - d104dca228e7e71ec5bf4119b8ef0ed3e8ebb3e8 + 2066cbb384f6d0fa6fd36963b1db78f86f598800 @@ -149,9 +149,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - 51df47643a8ee2715ac67fab8d652b25be070cd2 + 81877bd58d0f1efa2ce2d194ebaf545a84f74aba diff --git a/eng/Versions.props b/eng/Versions.props index f4ecd0fe6..99646269c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23109.26 - 7.0.300-preview.23109.26 - 7.0.300-preview.23109.26 + 7.0.300-preview.23110.8 + 7.0.300-preview.23110.8 + 7.0.300-preview.23110.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230209-01 + 17.6.0-preview-20230210-01 From e610a0a26a4bbd59d014a59c5d4b9a29bdfb49f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Feb 2023 01:24:10 +0000 Subject: [PATCH 34/43] Update dependencies from https://github.com/dotnet/sdk build 20230210.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23110.8 -> To Version 7.0.300-preview.23110.18 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks From Version 12.5.0-beta.23108.3 -> To Version 12.5.0-beta.23110.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2fa98b93..c9f658c82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 + f6cd3735f6aa9d0c555e7fd0271692472ef63197 - + https://github.com/dotnet/sdk - 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 + f6cd3735f6aa9d0c555e7fd0271692472ef63197 - + https://github.com/dotnet/sdk - 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 + f6cd3735f6aa9d0c555e7fd0271692472ef63197 - + https://github.com/dotnet/sdk - 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 + f6cd3735f6aa9d0c555e7fd0271692472ef63197 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 2d21a15e1b23ab18ff2e57c0f2ec82fb0011e6aa + 3dd78b8325ffae266e5f19b37a6c4d863f9b8f30 - + https://github.com/dotnet/fsharp - 2d21a15e1b23ab18ff2e57c0f2ec82fb0011e6aa + 3dd78b8325ffae266e5f19b37a6c4d863f9b8f30 @@ -138,9 +138,9 @@ 2066cbb384f6d0fa6fd36963b1db78f86f598800 - + https://github.com/dotnet/linker - de8bf14fcdfb55f2bae3db8cfc310ddd8ee921e6 + 19b53fbd053afc02fc20456d07d83fb8a94649c8 linker diff --git a/eng/Versions.props b/eng/Versions.props index 99646269c..d56cba3b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23110.8 - 7.0.300-preview.23110.8 - 7.0.300-preview.23110.8 + 7.0.300-preview.23110.18 + 7.0.300-preview.23110.18 + 7.0.300-preview.23110.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 245921006df478431f33fac85042d05c35833160 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Feb 2023 02:30:51 +0000 Subject: [PATCH 35/43] Update dependencies from https://github.com/dotnet/sdk build 20230212.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23110.18 -> To Version 7.0.300-preview.23112.4 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build From Version 17.6.0-preview-20230210-01 -> To Version 17.6.0-preview-20230210-02 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9f658c82..69ca43b54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - f6cd3735f6aa9d0c555e7fd0271692472ef63197 + 01a16c392cf012af247f499d8f0de4734c107031 - + https://github.com/dotnet/sdk - f6cd3735f6aa9d0c555e7fd0271692472ef63197 + 01a16c392cf012af247f499d8f0de4734c107031 - + https://github.com/dotnet/sdk - f6cd3735f6aa9d0c555e7fd0271692472ef63197 + 01a16c392cf012af247f499d8f0de4734c107031 - + https://github.com/dotnet/sdk - f6cd3735f6aa9d0c555e7fd0271692472ef63197 + 01a16c392cf012af247f499d8f0de4734c107031 @@ -133,9 +133,9 @@ 3dd78b8325ffae266e5f19b37a6c4d863f9b8f30 - + https://github.com/microsoft/vstest - 2066cbb384f6d0fa6fd36963b1db78f86f598800 + e545c34442e27a97197d574bc00fcd0fc2eece39 @@ -149,9 +149,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - 81877bd58d0f1efa2ce2d194ebaf545a84f74aba + dba9b2343547c39971c92627476a926bf6f730bd diff --git a/eng/Versions.props b/eng/Versions.props index d56cba3b5..69af11272 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23110.18 - 7.0.300-preview.23110.18 - 7.0.300-preview.23110.18 + 7.0.300-preview.23112.4 + 7.0.300-preview.23112.4 + 7.0.300-preview.23112.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230210-01 + 17.6.0-preview-20230210-02 From 91caa7d21ca963502f8e624603c749d4bd129598 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 13 Feb 2023 22:50:32 +0100 Subject: [PATCH 36/43] [automated] Merge branch 'release/7.0.2xx' => 'release/7.0.3xx' (#15514) Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai Co-authored-by: Matt Mitchell Co-authored-by: Michael Simons Co-authored-by: Logan Bussell Co-authored-by: Chris Rummel Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Co-authored-by: dotnet-bot Co-authored-by: DotNet-Bot Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: William Godbe Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Co-authored-by: Matt Thalman Co-authored-by: Daniel Plaisted --- .../src/Tarball_WriteSourceRepoProperties.cs | 1 - .../tarball/content/Directory.Build.props | 14 +++++------ .../pipelines/security-partners-dotnet.yml | 15 +++++++++++- .../content/repos/Directory.Build.props | 4 +++- .../tarball/content/repos/fsharp.proj | 1 - .../tarball/content/repos/xliff-tasks.proj | 2 -- test/SdkTests/SdkTests.csproj | 5 ++++ test/SdkTests/TestsToSkipOSX.xml | 23 +++++++++++++++++++ 8 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 test/SdkTests/TestsToSkipOSX.xml diff --git a/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs b/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs index b177b6f01..0dc26774e 100644 --- a/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs +++ b/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs @@ -71,7 +71,6 @@ namespace Microsoft.DotNet.SourceBuild.Tasks ["OfficialBuildId"] = derivedVersion.OfficialBuildId, ["OutputPackageVersion"] = dependency.Version, ["PreReleaseVersionLabel"] = derivedVersion.PreReleaseVersionLabel, - ["IsStable"] = string.IsNullOrWhiteSpace(derivedVersion.PreReleaseVersionLabel) ? "true" : "false", }; if (!string.IsNullOrEmpty(dependency.GitCommitCount)) { diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 6ca72bb7a..2f4a8ee71 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -216,13 +216,13 @@ - + - + - - - + + + @@ -238,8 +238,8 @@ - - + + diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index 6200e7fc0..02641873b 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -1,5 +1,18 @@ trigger: none +variables: +- name: cfsNPMWarnLevel + value: none + +- name: cfsNugetWarnLevel + value: none + +- name: myGetWarnLevel + value: none + +- name: NuGetSecurityAnalysisWarningLevel + value: none + jobs: - template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: @@ -7,7 +20,7 @@ jobs: excludeSdkContentTests: true matrix: Ubuntu2004-Offline: - _BootstrapPrep: false + _BootstrapPrep: true _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-20220813234344-4c008dd _EnablePoison: false _ExcludeOmniSharpTests: false diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index 04ab89d11..625d3fb5b 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -15,7 +15,6 @@ true $(LoggingDir)$(RepositoryName).log >> $(RepoConsoleLogFile) 2>&1 - true $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/ @@ -99,6 +98,9 @@ + + + diff --git a/src/SourceBuild/tarball/content/repos/fsharp.proj b/src/SourceBuild/tarball/content/repos/fsharp.proj index 3ffd14406..bc9a10be7 100644 --- a/src/SourceBuild/tarball/content/repos/fsharp.proj +++ b/src/SourceBuild/tarball/content/repos/fsharp.proj @@ -27,7 +27,6 @@ - $(StandardSourceBuildArgs) - - $(BuildCommandArgs) /p:CheckEolTargetFramework=false $(StandardSourceBuildCommand) $(BuildCommandArgs) false diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index b99346824..9fb5965a4 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -225,6 +225,11 @@ $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipPortableLinux.xml" + + + $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipOSX.xml" + + diff --git a/test/SdkTests/TestsToSkipOSX.xml b/test/SdkTests/TestsToSkipOSX.xml new file mode 100644 index 000000000..09330bb1f --- /dev/null +++ b/test/SdkTests/TestsToSkipOSX.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + From f6cac26eee3d578abf69ce659f1441e48ddd5109 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 15:51:59 -0800 Subject: [PATCH 37/43] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15525) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69ca43b54..7337c48b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 01a16c392cf012af247f499d8f0de4734c107031 + 0633039bb303781170ce9ac2e57565b1f4d121e5 - + https://github.com/dotnet/sdk - 01a16c392cf012af247f499d8f0de4734c107031 + 0633039bb303781170ce9ac2e57565b1f4d121e5 - + https://github.com/dotnet/sdk - 01a16c392cf012af247f499d8f0de4734c107031 + 0633039bb303781170ce9ac2e57565b1f4d121e5 - + https://github.com/dotnet/sdk - 01a16c392cf012af247f499d8f0de4734c107031 + 0633039bb303781170ce9ac2e57565b1f4d121e5 @@ -124,18 +124,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 3dd78b8325ffae266e5f19b37a6c4d863f9b8f30 + 3263ac15552940d944b4bff27547022ade3da16a - + https://github.com/dotnet/fsharp - 3dd78b8325ffae266e5f19b37a6c4d863f9b8f30 + 3263ac15552940d944b4bff27547022ade3da16a - + https://github.com/microsoft/vstest - e545c34442e27a97197d574bc00fcd0fc2eece39 + b6a8c3b174380a5d57059428d8d3840915325373 @@ -154,9 +154,9 @@ dba9b2343547c39971c92627476a926bf6f730bd - + https://github.com/nuget/nuget.client - 8dec976a1ae4f80c82b3007cd8a5c80bdc8f3b22 + b84ca7373557c5725836697f81786ed22e20ead5 diff --git a/eng/Versions.props b/eng/Versions.props index 69af11272..106b9f3ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23112.4 - 7.0.300-preview.23112.4 - 7.0.300-preview.23112.4 + 7.0.300-preview.23113.14 + 7.0.300-preview.23113.14 + 7.0.300-preview.23113.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230210-02 + 17.6.0-preview-20230213-02 From 51603b07e3db9aa4221960c9fe540a05d5c5ac87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Feb 2023 00:17:18 +0000 Subject: [PATCH 38/43] Update dependencies from https://github.com/dotnet/sdk build 20230213.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23113.14 -> To Version 7.0.300-preview.23113.21 --- 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 7337c48b4..2d523d445 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0633039bb303781170ce9ac2e57565b1f4d121e5 + 6d253cefc0cd96e51b5185cf65be05867311da54 - + https://github.com/dotnet/sdk - 0633039bb303781170ce9ac2e57565b1f4d121e5 + 6d253cefc0cd96e51b5185cf65be05867311da54 - + https://github.com/dotnet/sdk - 0633039bb303781170ce9ac2e57565b1f4d121e5 + 6d253cefc0cd96e51b5185cf65be05867311da54 - + https://github.com/dotnet/sdk - 0633039bb303781170ce9ac2e57565b1f4d121e5 + 6d253cefc0cd96e51b5185cf65be05867311da54 diff --git a/eng/Versions.props b/eng/Versions.props index 106b9f3ef..f4a965777 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23113.14 - 7.0.300-preview.23113.14 - 7.0.300-preview.23113.14 + 7.0.300-preview.23113.21 + 7.0.300-preview.23113.21 + 7.0.300-preview.23113.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7da88e07cc45e5da7e7ba71cf707ad9942ee7efb Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Tue, 14 Feb 2023 14:06:02 +0100 Subject: [PATCH 39/43] add tests for covering adding item templates (C# and VB) (#15343) --- test/EndToEnd/ProjectBuildTests.cs | 85 ++++++++++++++++++++++++------ 1 file changed, 69 insertions(+), 16 deletions(-) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index ec6684750..a19309b52 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Runtime.InteropServices; @@ -115,7 +116,7 @@ namespace EndToEnd.Tests .Execute(newArgs) .Should().Pass(); - string publishArgs="-r win-arm64"; + string publishArgs = "-r win-arm64"; new PublishCommand() .WithWorkingDirectory(projectDirectory) .Execute(publishArgs) @@ -149,7 +150,7 @@ namespace EndToEnd.Tests .Execute(newArgs) .Should().Pass(); - string publishArgs="-r win-arm64"; + string publishArgs = "-r win-arm64"; new PublishCommand() .WithWorkingDirectory(projectDirectory) .Execute(publishArgs) @@ -248,6 +249,47 @@ namespace EndToEnd.Tests Assert.True(directory.EnumerateFileSystemInfos().Any()); } + [Theory] + // microsoft.dotnet.common.itemtemplates templates + [InlineData("class")] + [InlineData("struct")] + [InlineData("enum")] + [InlineData("record")] + [InlineData("interface")] + [InlineData("class", "C#")] + [InlineData("class", "VB")] + [InlineData("struct", "VB")] + [InlineData("enum", "VB")] + [InlineData("interface", "VB")] + public void ItCanCreateItemTemplateWithProjectRestriction(string templateName, string language = "") + { + var languageExtensionMap = new Dictionary() + { + { "", ".cs" }, + { "C#", ".cs" }, + { "VB", ".vb" } + }; + + DirectoryInfo directory = InstantiateProjectTemplate("classlib", language, withNoRestore: false); + string projectDirectory = directory.FullName; + string expectedItemName = $"TestItem_{templateName}"; + string newArgs = $"{templateName} --name {expectedItemName} --debug:ephemeral-hive"; + if (!string.IsNullOrWhiteSpace(language)) + { + newArgs += $" --language {language}"; + } + + new NewCommandShim() + .WithWorkingDirectory(projectDirectory) + .Execute(newArgs) + .Should().Pass(); + + //check if the template created files + Assert.True(directory.Exists); + Assert.True(directory.EnumerateFileSystemInfos().Any()); + Assert.True(directory.GetFile($"{expectedItemName}.{languageExtensionMap[language]}") != null); + } + [WindowsOnlyTheory] [InlineData("wpf", Skip = "https://github.com/dotnet/wpf/issues/2363")] [InlineData("winforms", Skip = "https://github.com/dotnet/wpf/issues/2363")] @@ -402,20 +444,9 @@ namespace EndToEnd.Tests private static void TestTemplateCreateAndBuild(string templateName, bool build = true, bool selfContained = false, string language = "", string framework = "") { - DirectoryInfo directory = TestAssets.CreateTestDirectory(identifier: string.IsNullOrWhiteSpace(language) ? templateName : $"{templateName}[{language}]"); + DirectoryInfo directory = InstantiateProjectTemplate(templateName, language); string projectDirectory = directory.FullName; - string newArgs = $"{templateName} --debug:ephemeral-hive --no-restore"; - if (!string.IsNullOrWhiteSpace(language)) - { - newArgs += $" --language {language}"; - } - - new NewCommandShim() - .WithWorkingDirectory(projectDirectory) - .Execute(newArgs) - .Should().Pass(); - if (!string.IsNullOrWhiteSpace(framework)) { //check if MSBuild TargetFramework property for *proj is set to expected framework @@ -439,13 +470,13 @@ namespace EndToEnd.Tests { buildArgs += $" --framework {framework}"; } - + // Remove this (or formalize it) after https://github.com/dotnet/installer/issues/12479 is resolved. if (language == "F#") { buildArgs += $" /p:_NETCoreSdkIsPreview=true"; } - + string dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); new BuildCommand() .WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet @@ -454,5 +485,27 @@ namespace EndToEnd.Tests .Should().Pass(); } } + + private static DirectoryInfo InstantiateProjectTemplate(string templateName, string language = "", bool withNoRestore = true) + { + DirectoryInfo directory = TestAssets.CreateTestDirectory( + identifier: string.IsNullOrWhiteSpace(language) + ? templateName + : $"{templateName}[{language}]"); + string projectDirectory = directory.FullName; + + string newArgs = $"{templateName} --debug:ephemeral-hive {(withNoRestore ? "--no-restore" : "")}"; + if (!string.IsNullOrWhiteSpace(language)) + { + newArgs += $" --language {language}"; + } + + new NewCommandShim() + .WithWorkingDirectory(projectDirectory) + .Execute(newArgs) + .Should().Pass(); + + return directory; + } } } From 975f12e9e8f5906daebadc89f762cbc915b08f24 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 09:53:16 -0800 Subject: [PATCH 40/43] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15531) Co-authored-by: dotnet-maestro[bot] --- 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 2d523d445..92e76677c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 6d253cefc0cd96e51b5185cf65be05867311da54 + 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 - + https://github.com/dotnet/sdk - 6d253cefc0cd96e51b5185cf65be05867311da54 + 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 - + https://github.com/dotnet/sdk - 6d253cefc0cd96e51b5185cf65be05867311da54 + 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 - + https://github.com/dotnet/sdk - 6d253cefc0cd96e51b5185cf65be05867311da54 + 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 @@ -149,9 +149,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - dba9b2343547c39971c92627476a926bf6f730bd + 03de075bf00cadc8cf6e884f1719ea1d2da5b30e diff --git a/eng/Versions.props b/eng/Versions.props index f4a965777..f811a41e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23113.21 - 7.0.300-preview.23113.21 - 7.0.300-preview.23113.21 + 7.0.300-preview.23114.3 + 7.0.300-preview.23114.3 + 7.0.300-preview.23114.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6059f9bcac5e1408e4c587e5cfede40938432e97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Feb 2023 19:17:16 +0000 Subject: [PATCH 41/43] Update dependencies from https://github.com/dotnet/sdk build 20230214.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23114.3 -> To Version 7.0.300-preview.23114.6 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230213-02 -> To Version 17.6.0-preview-20230213-04 (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 92e76677c..43a9007a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 + 8e4346a910549b1221c24bec7bc2fdff17367293 - + https://github.com/dotnet/sdk - 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 + 8e4346a910549b1221c24bec7bc2fdff17367293 - + https://github.com/dotnet/sdk - 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 + 8e4346a910549b1221c24bec7bc2fdff17367293 - + https://github.com/dotnet/sdk - 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 + 8e4346a910549b1221c24bec7bc2fdff17367293 @@ -133,9 +133,9 @@ 3263ac15552940d944b4bff27547022ade3da16a - + https://github.com/microsoft/vstest - b6a8c3b174380a5d57059428d8d3840915325373 + 4bb2af558ce5bea6b8822135fa88fa6ae035b408 diff --git a/eng/Versions.props b/eng/Versions.props index f811a41e0..f2e3e9542 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23114.3 - 7.0.300-preview.23114.3 - 7.0.300-preview.23114.3 + 7.0.300-preview.23114.6 + 7.0.300-preview.23114.6 + 7.0.300-preview.23114.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230213-02 + 17.6.0-preview-20230213-04 From 920b57b9202706724e42891af8c4773eae9298f0 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 14 Feb 2023 16:51:47 -0800 Subject: [PATCH 42/43] [release/7.0.3xx] Bump ASP.NET template versions (#15546) - regular 6.0.x update - noticed we serviced the 3.0.x template but didn't reflect that here --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f2e3e9542..f28f3a89d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,7 +135,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.13 + 6.0.14 $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) @@ -159,7 +159,7 @@ 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) $(MicrosoftDotNetTestProjectTemplates30PackageVersion) - 3.0.1 + 3.0.3 1.5.3 1.0.2-beta3 From 2b6a12615fd9bfbf38fc2023442203e33abd0de2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 16:59:10 -0800 Subject: [PATCH 43/43] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15545) Co-authored-by: dotnet-maestro[bot] --- 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 43a9007a0..facb64304 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 8e4346a910549b1221c24bec7bc2fdff17367293 + 758db962ccbfa4526798159135034b30209dc454 - + https://github.com/dotnet/sdk - 8e4346a910549b1221c24bec7bc2fdff17367293 + 758db962ccbfa4526798159135034b30209dc454 - + https://github.com/dotnet/sdk - 8e4346a910549b1221c24bec7bc2fdff17367293 + 758db962ccbfa4526798159135034b30209dc454 - + https://github.com/dotnet/sdk - 8e4346a910549b1221c24bec7bc2fdff17367293 + 758db962ccbfa4526798159135034b30209dc454 diff --git a/eng/Versions.props b/eng/Versions.props index f28f3a89d..03c93d912 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23114.6 - 7.0.300-preview.23114.6 - 7.0.300-preview.23114.6 + 7.0.300-preview.23114.15 + 7.0.300-preview.23114.15 + 7.0.300-preview.23114.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)