From 18962a3c7822758de57e9ed8b9758d7c7eee0648 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Sep 2023 21:51:27 +0000 Subject: [PATCH 001/109] Update dependencies from https://github.com/dotnet/sdk build 20230927.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23477.24 --- 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 4675b71fa..cd2db008b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - db5e29522ce8381a9b4c133e9001edb1f90a7d5c + fc3aa5c42f33d2cab078cd81882189148b21b888 - + https://github.com/dotnet/sdk - db5e29522ce8381a9b4c133e9001edb1f90a7d5c + fc3aa5c42f33d2cab078cd81882189148b21b888 - + https://github.com/dotnet/sdk - db5e29522ce8381a9b4c133e9001edb1f90a7d5c + fc3aa5c42f33d2cab078cd81882189148b21b888 - + https://github.com/dotnet/sdk - db5e29522ce8381a9b4c133e9001edb1f90a7d5c + fc3aa5c42f33d2cab078cd81882189148b21b888 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f6c28f081..06aa00730 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23477.13 - 9.0.100-alpha.1.23477.13 - 9.0.100-alpha.1.23477.13 + 9.0.100-alpha.1.23477.24 + 9.0.100-alpha.1.23477.24 + 9.0.100-alpha.1.23477.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6fad1857303b891060344a12bbeae0688dda8abf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Sep 2023 23:18:39 +0000 Subject: [PATCH 002/109] Update dependencies from https://github.com/dotnet/sdk build 20230927.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23477.27 --- 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 cd2db008b..00e69099e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - fc3aa5c42f33d2cab078cd81882189148b21b888 + 0aa624d0382eefb1f7b49f9a9faa29262a584793 - + https://github.com/dotnet/sdk - fc3aa5c42f33d2cab078cd81882189148b21b888 + 0aa624d0382eefb1f7b49f9a9faa29262a584793 - + https://github.com/dotnet/sdk - fc3aa5c42f33d2cab078cd81882189148b21b888 + 0aa624d0382eefb1f7b49f9a9faa29262a584793 - + https://github.com/dotnet/sdk - fc3aa5c42f33d2cab078cd81882189148b21b888 + 0aa624d0382eefb1f7b49f9a9faa29262a584793 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 06aa00730..ea84d3158 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23477.24 - 9.0.100-alpha.1.23477.24 - 9.0.100-alpha.1.23477.24 + 9.0.100-alpha.1.23477.27 + 9.0.100-alpha.1.23477.27 + 9.0.100-alpha.1.23477.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c225c3fb9b59961856eb2078e15645e88d5067d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Sep 2023 00:11:11 +0000 Subject: [PATCH 003/109] Update dependencies from https://github.com/dotnet/sdk build 20230927.31 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23477.31 --- 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 00e69099e..b2e6224f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 0aa624d0382eefb1f7b49f9a9faa29262a584793 + c46688dbb864bb85db6f1c4507834459f070aa6c - + https://github.com/dotnet/sdk - 0aa624d0382eefb1f7b49f9a9faa29262a584793 + c46688dbb864bb85db6f1c4507834459f070aa6c - + https://github.com/dotnet/sdk - 0aa624d0382eefb1f7b49f9a9faa29262a584793 + c46688dbb864bb85db6f1c4507834459f070aa6c - + https://github.com/dotnet/sdk - 0aa624d0382eefb1f7b49f9a9faa29262a584793 + c46688dbb864bb85db6f1c4507834459f070aa6c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ea84d3158..38baf7fa1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23477.27 - 9.0.100-alpha.1.23477.27 - 9.0.100-alpha.1.23477.27 + 9.0.100-alpha.1.23477.31 + 9.0.100-alpha.1.23477.31 + 9.0.100-alpha.1.23477.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4a587bae4ce2d993c94d6041ec30947323761d2d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Sep 2023 01:15:56 +0000 Subject: [PATCH 004/109] Update dependencies from https://github.com/dotnet/sdk build 20230927.43 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23477.43 --- 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 b2e6224f2..c8d17e8b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - c46688dbb864bb85db6f1c4507834459f070aa6c + 84c1f2c8e84dec6bb8f517c7d22254ea2a1a85fb - + https://github.com/dotnet/sdk - c46688dbb864bb85db6f1c4507834459f070aa6c + 84c1f2c8e84dec6bb8f517c7d22254ea2a1a85fb - + https://github.com/dotnet/sdk - c46688dbb864bb85db6f1c4507834459f070aa6c + 84c1f2c8e84dec6bb8f517c7d22254ea2a1a85fb - + https://github.com/dotnet/sdk - c46688dbb864bb85db6f1c4507834459f070aa6c + 84c1f2c8e84dec6bb8f517c7d22254ea2a1a85fb https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 38baf7fa1..8a2c20da1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23477.31 - 9.0.100-alpha.1.23477.31 - 9.0.100-alpha.1.23477.31 + 9.0.100-alpha.1.23477.43 + 9.0.100-alpha.1.23477.43 + 9.0.100-alpha.1.23477.43 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0f8c185ef173d80a6d6c85ac8e74ef71eaa7b675 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Sep 2023 02:00:33 +0000 Subject: [PATCH 005/109] Update dependencies from https://github.com/dotnet/sdk build 20230927.47 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23477.47 --- 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 c8d17e8b7..131d2a773 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 84c1f2c8e84dec6bb8f517c7d22254ea2a1a85fb + b92ef3a09f167eaea492f630f1b2f68ee6d759cb - + https://github.com/dotnet/sdk - 84c1f2c8e84dec6bb8f517c7d22254ea2a1a85fb + b92ef3a09f167eaea492f630f1b2f68ee6d759cb - + https://github.com/dotnet/sdk - 84c1f2c8e84dec6bb8f517c7d22254ea2a1a85fb + b92ef3a09f167eaea492f630f1b2f68ee6d759cb - + https://github.com/dotnet/sdk - 84c1f2c8e84dec6bb8f517c7d22254ea2a1a85fb + b92ef3a09f167eaea492f630f1b2f68ee6d759cb https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 8a2c20da1..b18a9ae38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23477.43 - 9.0.100-alpha.1.23477.43 - 9.0.100-alpha.1.23477.43 + 9.0.100-alpha.1.23477.47 + 9.0.100-alpha.1.23477.47 + 9.0.100-alpha.1.23477.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b1044dbfb04a590487e11f2064e0aa96878cbf28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Sep 2023 06:19:51 +0000 Subject: [PATCH 006/109] Update dependencies from https://github.com/dotnet/sdk build 20230927.63 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23477.63 --- 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 131d2a773..354d08695 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - b92ef3a09f167eaea492f630f1b2f68ee6d759cb + b575887007e9390607cdff70621cdbeb59896314 - + https://github.com/dotnet/sdk - b92ef3a09f167eaea492f630f1b2f68ee6d759cb + b575887007e9390607cdff70621cdbeb59896314 - + https://github.com/dotnet/sdk - b92ef3a09f167eaea492f630f1b2f68ee6d759cb + b575887007e9390607cdff70621cdbeb59896314 - + https://github.com/dotnet/sdk - b92ef3a09f167eaea492f630f1b2f68ee6d759cb + b575887007e9390607cdff70621cdbeb59896314 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b18a9ae38..41d02c75a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23477.47 - 9.0.100-alpha.1.23477.47 - 9.0.100-alpha.1.23477.47 + 9.0.100-alpha.1.23477.63 + 9.0.100-alpha.1.23477.63 + 9.0.100-alpha.1.23477.63 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 581c2e6ff7dcad6a3a617aca53249e3615d0093d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Sep 2023 20:09:52 +0000 Subject: [PATCH 007/109] Update dependencies from https://github.com/dotnet/sdk build 20230928.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23478.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 354d08695..4141e8fdc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - b575887007e9390607cdff70621cdbeb59896314 + 1961634123dc02d79be336c82075af5bcdd98a9b - + https://github.com/dotnet/sdk - b575887007e9390607cdff70621cdbeb59896314 + 1961634123dc02d79be336c82075af5bcdd98a9b - + https://github.com/dotnet/sdk - b575887007e9390607cdff70621cdbeb59896314 + 1961634123dc02d79be336c82075af5bcdd98a9b - + https://github.com/dotnet/sdk - b575887007e9390607cdff70621cdbeb59896314 + 1961634123dc02d79be336c82075af5bcdd98a9b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 41d02c75a..0d0b40a45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23477.63 - 9.0.100-alpha.1.23477.63 - 9.0.100-alpha.1.23477.63 + 9.0.100-alpha.1.23478.21 + 9.0.100-alpha.1.23478.21 + 9.0.100-alpha.1.23478.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ddede9dc80b894d4995cec2d12ce77363c1d61c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Sep 2023 21:23:45 +0000 Subject: [PATCH 008/109] Update dependencies from https://github.com/dotnet/sdk build 20230928.28 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23478.28 --- 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 4141e8fdc..1b858e24f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 1961634123dc02d79be336c82075af5bcdd98a9b + 3f2b02063f7419df62f091e6b696b3555dc9acd8 - + https://github.com/dotnet/sdk - 1961634123dc02d79be336c82075af5bcdd98a9b + 3f2b02063f7419df62f091e6b696b3555dc9acd8 - + https://github.com/dotnet/sdk - 1961634123dc02d79be336c82075af5bcdd98a9b + 3f2b02063f7419df62f091e6b696b3555dc9acd8 - + https://github.com/dotnet/sdk - 1961634123dc02d79be336c82075af5bcdd98a9b + 3f2b02063f7419df62f091e6b696b3555dc9acd8 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 0d0b40a45..9c5caf49a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23478.21 - 9.0.100-alpha.1.23478.21 - 9.0.100-alpha.1.23478.21 + 9.0.100-alpha.1.23478.28 + 9.0.100-alpha.1.23478.28 + 9.0.100-alpha.1.23478.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6b9336613bef0bf8be971690820c1af9c3cee0e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Sep 2023 22:10:46 +0000 Subject: [PATCH 009/109] Update dependencies from https://github.com/dotnet/sdk build 20230928.31 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23478.31 --- 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 1b858e24f..751320f0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 3f2b02063f7419df62f091e6b696b3555dc9acd8 + 0834de4aff89a98973cd3534c92ec9816e28c6af - + https://github.com/dotnet/sdk - 3f2b02063f7419df62f091e6b696b3555dc9acd8 + 0834de4aff89a98973cd3534c92ec9816e28c6af - + https://github.com/dotnet/sdk - 3f2b02063f7419df62f091e6b696b3555dc9acd8 + 0834de4aff89a98973cd3534c92ec9816e28c6af - + https://github.com/dotnet/sdk - 3f2b02063f7419df62f091e6b696b3555dc9acd8 + 0834de4aff89a98973cd3534c92ec9816e28c6af https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9c5caf49a..ce1bf1b86 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23478.28 - 9.0.100-alpha.1.23478.28 - 9.0.100-alpha.1.23478.28 + 9.0.100-alpha.1.23478.31 + 9.0.100-alpha.1.23478.31 + 9.0.100-alpha.1.23478.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 49d7bea31e0c0860f74c6b2d592089f335feb7f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Sep 2023 22:55:19 +0000 Subject: [PATCH 010/109] Update dependencies from https://github.com/dotnet/sdk build 20230928.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23478.34 --- 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 751320f0f..c79b5c779 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 0834de4aff89a98973cd3534c92ec9816e28c6af + dba711f07f07f49745430d30f84ce684f85aaea1 - + https://github.com/dotnet/sdk - 0834de4aff89a98973cd3534c92ec9816e28c6af + dba711f07f07f49745430d30f84ce684f85aaea1 - + https://github.com/dotnet/sdk - 0834de4aff89a98973cd3534c92ec9816e28c6af + dba711f07f07f49745430d30f84ce684f85aaea1 - + https://github.com/dotnet/sdk - 0834de4aff89a98973cd3534c92ec9816e28c6af + dba711f07f07f49745430d30f84ce684f85aaea1 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ce1bf1b86..b2baa6af6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23478.31 - 9.0.100-alpha.1.23478.31 - 9.0.100-alpha.1.23478.31 + 9.0.100-alpha.1.23478.34 + 9.0.100-alpha.1.23478.34 + 9.0.100-alpha.1.23478.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 36cad7022482f2309298660e67c2e0b2f896f227 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Sep 2023 16:54:02 +0000 Subject: [PATCH 011/109] Update dependencies from https://github.com/dotnet/sdk build 20230929.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23479.8 --- 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 c79b5c779..14644eb2a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - dba711f07f07f49745430d30f84ce684f85aaea1 + 6d418d42bdeadc98dcc8c49389df3c1ab85aec60 - + https://github.com/dotnet/sdk - dba711f07f07f49745430d30f84ce684f85aaea1 + 6d418d42bdeadc98dcc8c49389df3c1ab85aec60 - + https://github.com/dotnet/sdk - dba711f07f07f49745430d30f84ce684f85aaea1 + 6d418d42bdeadc98dcc8c49389df3c1ab85aec60 - + https://github.com/dotnet/sdk - dba711f07f07f49745430d30f84ce684f85aaea1 + 6d418d42bdeadc98dcc8c49389df3c1ab85aec60 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b2baa6af6..32c616e48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23478.34 - 9.0.100-alpha.1.23478.34 - 9.0.100-alpha.1.23478.34 + 9.0.100-alpha.1.23479.8 + 9.0.100-alpha.1.23479.8 + 9.0.100-alpha.1.23479.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 589c846a72a3374fccd095ecd61bb7264ffa2846 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Sep 2023 18:12:59 +0000 Subject: [PATCH 012/109] Update dependencies from https://github.com/dotnet/sdk build 20230929.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23479.11 --- 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 14644eb2a..706c20f17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 6d418d42bdeadc98dcc8c49389df3c1ab85aec60 + 69493b9d7b1cdb0a33dddbdfba8ef2b9a87a2d16 - + https://github.com/dotnet/sdk - 6d418d42bdeadc98dcc8c49389df3c1ab85aec60 + 69493b9d7b1cdb0a33dddbdfba8ef2b9a87a2d16 - + https://github.com/dotnet/sdk - 6d418d42bdeadc98dcc8c49389df3c1ab85aec60 + 69493b9d7b1cdb0a33dddbdfba8ef2b9a87a2d16 - + https://github.com/dotnet/sdk - 6d418d42bdeadc98dcc8c49389df3c1ab85aec60 + 69493b9d7b1cdb0a33dddbdfba8ef2b9a87a2d16 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 32c616e48..c7c03258a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23479.8 - 9.0.100-alpha.1.23479.8 - 9.0.100-alpha.1.23479.8 + 9.0.100-alpha.1.23479.11 + 9.0.100-alpha.1.23479.11 + 9.0.100-alpha.1.23479.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From abd2beaa094ea89a0f3f722b76cf2a0c97739d03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 30 Sep 2023 08:39:36 +0000 Subject: [PATCH 013/109] Update dependencies from https://github.com/dotnet/sdk build 20230930.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23480.1 --- 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 706c20f17..648f71951 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 69493b9d7b1cdb0a33dddbdfba8ef2b9a87a2d16 + bd9fe1f506ec4b133c9cf85df6b3e6cf55b9450f - + https://github.com/dotnet/sdk - 69493b9d7b1cdb0a33dddbdfba8ef2b9a87a2d16 + bd9fe1f506ec4b133c9cf85df6b3e6cf55b9450f - + https://github.com/dotnet/sdk - 69493b9d7b1cdb0a33dddbdfba8ef2b9a87a2d16 + bd9fe1f506ec4b133c9cf85df6b3e6cf55b9450f - + https://github.com/dotnet/sdk - 69493b9d7b1cdb0a33dddbdfba8ef2b9a87a2d16 + bd9fe1f506ec4b133c9cf85df6b3e6cf55b9450f https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index c7c03258a..0258d24bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23479.11 - 9.0.100-alpha.1.23479.11 - 9.0.100-alpha.1.23479.11 + 9.0.100-alpha.1.23480.1 + 9.0.100-alpha.1.23480.1 + 9.0.100-alpha.1.23480.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6ac3cbbe5df2ff745abddabf957dfd341cc3b7d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Oct 2023 18:03:55 +0000 Subject: [PATCH 014/109] Update dependencies from https://github.com/dotnet/sdk build 20231002.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23502.1 --- 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 648f71951..dcef15f56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - bd9fe1f506ec4b133c9cf85df6b3e6cf55b9450f + 8e0cbf15caa70f0646218ed9598cbf48d9fbbcff - + https://github.com/dotnet/sdk - bd9fe1f506ec4b133c9cf85df6b3e6cf55b9450f + 8e0cbf15caa70f0646218ed9598cbf48d9fbbcff - + https://github.com/dotnet/sdk - bd9fe1f506ec4b133c9cf85df6b3e6cf55b9450f + 8e0cbf15caa70f0646218ed9598cbf48d9fbbcff - + https://github.com/dotnet/sdk - bd9fe1f506ec4b133c9cf85df6b3e6cf55b9450f + 8e0cbf15caa70f0646218ed9598cbf48d9fbbcff https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 0258d24bf..cba4e344a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23480.1 - 9.0.100-alpha.1.23480.1 - 9.0.100-alpha.1.23480.1 + 9.0.100-alpha.1.23502.1 + 9.0.100-alpha.1.23502.1 + 9.0.100-alpha.1.23502.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4bb84443abb9cd2c5bb6e113f95bfd51a35dac9d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Oct 2023 23:25:29 +0000 Subject: [PATCH 015/109] Update dependencies from https://github.com/dotnet/sdk build 20231002.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23502.2 --- 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 dcef15f56..2509cf8bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 8e0cbf15caa70f0646218ed9598cbf48d9fbbcff + 0edf4a9738ac3ba5aada4451ccaaf3fd70923cde - + https://github.com/dotnet/sdk - 8e0cbf15caa70f0646218ed9598cbf48d9fbbcff + 0edf4a9738ac3ba5aada4451ccaaf3fd70923cde - + https://github.com/dotnet/sdk - 8e0cbf15caa70f0646218ed9598cbf48d9fbbcff + 0edf4a9738ac3ba5aada4451ccaaf3fd70923cde - + https://github.com/dotnet/sdk - 8e0cbf15caa70f0646218ed9598cbf48d9fbbcff + 0edf4a9738ac3ba5aada4451ccaaf3fd70923cde https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index cba4e344a..4330c44ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23502.1 - 9.0.100-alpha.1.23502.1 - 9.0.100-alpha.1.23502.1 + 9.0.100-alpha.1.23502.2 + 9.0.100-alpha.1.23502.2 + 9.0.100-alpha.1.23502.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f834132d5522d81b27bd90fa110af771dc5def42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Oct 2023 00:13:41 +0000 Subject: [PATCH 016/109] Update dependencies from https://github.com/dotnet/sdk build 20231002.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23502.5 --- 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 2509cf8bc..5264fe267 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 0edf4a9738ac3ba5aada4451ccaaf3fd70923cde + 8f3996c32f349dd5124f6419bc12066e6df02d3f - + https://github.com/dotnet/sdk - 0edf4a9738ac3ba5aada4451ccaaf3fd70923cde + 8f3996c32f349dd5124f6419bc12066e6df02d3f - + https://github.com/dotnet/sdk - 0edf4a9738ac3ba5aada4451ccaaf3fd70923cde + 8f3996c32f349dd5124f6419bc12066e6df02d3f - + https://github.com/dotnet/sdk - 0edf4a9738ac3ba5aada4451ccaaf3fd70923cde + 8f3996c32f349dd5124f6419bc12066e6df02d3f https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 4330c44ea..738461bad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23502.2 - 9.0.100-alpha.1.23502.2 - 9.0.100-alpha.1.23502.2 + 9.0.100-alpha.1.23502.5 + 9.0.100-alpha.1.23502.5 + 9.0.100-alpha.1.23502.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0adbf903b63e50ccb7b5af40bb72d2da6d487c99 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Oct 2023 01:03:53 +0000 Subject: [PATCH 017/109] Update dependencies from https://github.com/dotnet/sdk build 20231002.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23502.8 --- 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 5264fe267..42e7ee966 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 8f3996c32f349dd5124f6419bc12066e6df02d3f + 7d2a639732897d42e89486f2b6b17af19eaa8cfd - + https://github.com/dotnet/sdk - 8f3996c32f349dd5124f6419bc12066e6df02d3f + 7d2a639732897d42e89486f2b6b17af19eaa8cfd - + https://github.com/dotnet/sdk - 8f3996c32f349dd5124f6419bc12066e6df02d3f + 7d2a639732897d42e89486f2b6b17af19eaa8cfd - + https://github.com/dotnet/sdk - 8f3996c32f349dd5124f6419bc12066e6df02d3f + 7d2a639732897d42e89486f2b6b17af19eaa8cfd https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 738461bad..9ab4078e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23502.5 - 9.0.100-alpha.1.23502.5 - 9.0.100-alpha.1.23502.5 + 9.0.100-alpha.1.23502.8 + 9.0.100-alpha.1.23502.8 + 9.0.100-alpha.1.23502.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 69b969bae8bb8faff8ab89a0686db3a4e83f13d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Oct 2023 18:40:47 +0000 Subject: [PATCH 018/109] Update dependencies from https://github.com/dotnet/sdk build 20231003.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23503.3 --- 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 42e7ee966..63fd0d628 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 7d2a639732897d42e89486f2b6b17af19eaa8cfd + cc67f450d5d5bcc4f034ed93d0f730c721c61a94 - + https://github.com/dotnet/sdk - 7d2a639732897d42e89486f2b6b17af19eaa8cfd + cc67f450d5d5bcc4f034ed93d0f730c721c61a94 - + https://github.com/dotnet/sdk - 7d2a639732897d42e89486f2b6b17af19eaa8cfd + cc67f450d5d5bcc4f034ed93d0f730c721c61a94 - + https://github.com/dotnet/sdk - 7d2a639732897d42e89486f2b6b17af19eaa8cfd + cc67f450d5d5bcc4f034ed93d0f730c721c61a94 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9ab4078e6..695994655 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23502.8 - 9.0.100-alpha.1.23502.8 - 9.0.100-alpha.1.23502.8 + 9.0.100-alpha.1.23503.3 + 9.0.100-alpha.1.23503.3 + 9.0.100-alpha.1.23503.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 11b0f174ce7ee069c316a110d7fc7d9a6bdfad4e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Oct 2023 19:26:51 +0000 Subject: [PATCH 019/109] Update dependencies from https://github.com/dotnet/sdk build 20231003.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23503.6 --- 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 63fd0d628..edd5ff51c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - cc67f450d5d5bcc4f034ed93d0f730c721c61a94 + eb7d0a486edc115cefed7c9a236c2d4979b31fae - + https://github.com/dotnet/sdk - cc67f450d5d5bcc4f034ed93d0f730c721c61a94 + eb7d0a486edc115cefed7c9a236c2d4979b31fae - + https://github.com/dotnet/sdk - cc67f450d5d5bcc4f034ed93d0f730c721c61a94 + eb7d0a486edc115cefed7c9a236c2d4979b31fae - + https://github.com/dotnet/sdk - cc67f450d5d5bcc4f034ed93d0f730c721c61a94 + eb7d0a486edc115cefed7c9a236c2d4979b31fae https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 695994655..268403f1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23503.3 - 9.0.100-alpha.1.23503.3 - 9.0.100-alpha.1.23503.3 + 9.0.100-alpha.1.23503.6 + 9.0.100-alpha.1.23503.6 + 9.0.100-alpha.1.23503.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e3e8462efe9698b6e7a8ebceef56187ffb03c80b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Oct 2023 20:18:44 +0000 Subject: [PATCH 020/109] Update dependencies from https://github.com/dotnet/sdk build 20231003.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23503.9 --- 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 edd5ff51c..07ccd4d53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - eb7d0a486edc115cefed7c9a236c2d4979b31fae + 49ece0429dce4b77917fdeb9d72b7f237d1e8d2c - + https://github.com/dotnet/sdk - eb7d0a486edc115cefed7c9a236c2d4979b31fae + 49ece0429dce4b77917fdeb9d72b7f237d1e8d2c - + https://github.com/dotnet/sdk - eb7d0a486edc115cefed7c9a236c2d4979b31fae + 49ece0429dce4b77917fdeb9d72b7f237d1e8d2c - + https://github.com/dotnet/sdk - eb7d0a486edc115cefed7c9a236c2d4979b31fae + 49ece0429dce4b77917fdeb9d72b7f237d1e8d2c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 268403f1e..8cea3e552 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23503.6 - 9.0.100-alpha.1.23503.6 - 9.0.100-alpha.1.23503.6 + 9.0.100-alpha.1.23503.9 + 9.0.100-alpha.1.23503.9 + 9.0.100-alpha.1.23503.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From afd55951c17fe1ed3bd631a32f98076bace64831 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Oct 2023 17:53:29 +0000 Subject: [PATCH 021/109] Update dependencies from https://github.com/dotnet/sdk build 20231004.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23504.7 --- 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 07ccd4d53..3e50ef623 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 49ece0429dce4b77917fdeb9d72b7f237d1e8d2c + c14ca8b9c93326a84996863a6ba32a2a3c93c39e - + https://github.com/dotnet/sdk - 49ece0429dce4b77917fdeb9d72b7f237d1e8d2c + c14ca8b9c93326a84996863a6ba32a2a3c93c39e - + https://github.com/dotnet/sdk - 49ece0429dce4b77917fdeb9d72b7f237d1e8d2c + c14ca8b9c93326a84996863a6ba32a2a3c93c39e - + https://github.com/dotnet/sdk - 49ece0429dce4b77917fdeb9d72b7f237d1e8d2c + c14ca8b9c93326a84996863a6ba32a2a3c93c39e https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 8cea3e552..10ed7458b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23503.9 - 9.0.100-alpha.1.23503.9 - 9.0.100-alpha.1.23503.9 + 9.0.100-alpha.1.23504.7 + 9.0.100-alpha.1.23504.7 + 9.0.100-alpha.1.23504.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 04b91a8a44d06eb0f93ef154a0bd131311390fc4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Oct 2023 18:46:44 +0000 Subject: [PATCH 022/109] Update dependencies from https://github.com/dotnet/sdk build 20231004.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23504.10 --- 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 3e50ef623..afa9c31c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - c14ca8b9c93326a84996863a6ba32a2a3c93c39e + ed3fc8f4160da28412818f4f49ede49428174de5 - + https://github.com/dotnet/sdk - c14ca8b9c93326a84996863a6ba32a2a3c93c39e + ed3fc8f4160da28412818f4f49ede49428174de5 - + https://github.com/dotnet/sdk - c14ca8b9c93326a84996863a6ba32a2a3c93c39e + ed3fc8f4160da28412818f4f49ede49428174de5 - + https://github.com/dotnet/sdk - c14ca8b9c93326a84996863a6ba32a2a3c93c39e + ed3fc8f4160da28412818f4f49ede49428174de5 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 10ed7458b..fe7bc3cdd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23504.7 - 9.0.100-alpha.1.23504.7 - 9.0.100-alpha.1.23504.7 + 9.0.100-alpha.1.23504.10 + 9.0.100-alpha.1.23504.10 + 9.0.100-alpha.1.23504.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b2b17362eb066a2e5d37a21b00029b119a88250d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Oct 2023 19:33:12 +0000 Subject: [PATCH 023/109] Update dependencies from https://github.com/dotnet/sdk build 20231004.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.1.23414.10 -> To Version 9.0.100-alpha.1.23504.15 --- 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 afa9c31c6..f024af91e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - ed3fc8f4160da28412818f4f49ede49428174de5 + 54164e5d98adf5d0ca27d7a44b2e0b6d3fe53f99 - + https://github.com/dotnet/sdk - ed3fc8f4160da28412818f4f49ede49428174de5 + 54164e5d98adf5d0ca27d7a44b2e0b6d3fe53f99 - + https://github.com/dotnet/sdk - ed3fc8f4160da28412818f4f49ede49428174de5 + 54164e5d98adf5d0ca27d7a44b2e0b6d3fe53f99 - + https://github.com/dotnet/sdk - ed3fc8f4160da28412818f4f49ede49428174de5 + 54164e5d98adf5d0ca27d7a44b2e0b6d3fe53f99 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index fe7bc3cdd..0d7f5142b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23504.10 - 9.0.100-alpha.1.23504.10 - 9.0.100-alpha.1.23504.10 + 9.0.100-alpha.1.23504.15 + 9.0.100-alpha.1.23504.15 + 9.0.100-alpha.1.23504.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ac121cf57d6d167bd0733983a4c6fb7e8dce5493 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Oct 2023 12:15:17 +0000 Subject: [PATCH 024/109] Update dependencies from https://github.com/dotnet/arcade build 20231004.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23504.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 + eng/Version.Details.xml | 54 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 6 ++--- global.json | 4 +-- 6 files changed, 41 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 580412928..a86327e94 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9a55fc66..ccff8db3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 52e969f93c15d4eaa2f709ebbfe168fb1bb09fa2 + bfe4ef2faa611d3c597d08fdcf73f7142d8a02e0 - + https://github.com/dotnet/windowsdesktop - 52e969f93c15d4eaa2f709ebbfe168fb1bb09fa2 + bfe4ef2faa611d3c597d08fdcf73f7142d8a02e0 - + https://github.com/dotnet/windowsdesktop - 52e969f93c15d4eaa2f709ebbfe168fb1bb09fa2 + bfe4ef2faa611d3c597d08fdcf73f7142d8a02e0 - + https://github.com/dotnet/windowsdesktop - 52e969f93c15d4eaa2f709ebbfe168fb1bb09fa2 + bfe4ef2faa611d3c597d08fdcf73f7142d8a02e0 https://github.com/dotnet/runtime @@ -30,7 +30,7 @@ https://github.com/dotnet/runtime 736dabeca728ccf8b911d96d1b4c575b4d0db7d2 - + https://github.com/dotnet/runtime f8c110b8003d68cc635add4ca791d6cf2e645561 @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 3a8376ca92de4c85dd92b05fba8a1c0a49b14cb9 - + https://github.com/dotnet/fsharp - 767ffa73e8147418ecf54df376e6685b03efd6e4 + 10f956e631a1efc0f7f5e49c626c494cd32b1f50 - + https://github.com/dotnet/fsharp - 767ffa73e8147418ecf54df376e6685b03efd6e4 + 10f956e631a1efc0f7f5e49c626c494cd32b1f50 @@ -146,19 +146,19 @@ https://github.com/dotnet/runtime 736dabeca728ccf8b911d96d1b4c575b4d0db7d2 - + https://github.com/dotnet/roslyn - 79963f8a40c6429cd25667c4c62e717b4ca72098 + a0f635227f57c805c30ebb06a5afecacc77035f5 - + https://github.com/dotnet/msbuild - 60ae06f6d20616f524a751373aea071df8c2ae48 + 6cdef424154c976f04802b101e6be6292f8a8897 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 @@ -202,18 +202,18 @@ - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + f1868a684ed9766d4247d672fd5f96bba4d4bb00 - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + f1868a684ed9766d4247d672fd5f96bba4d4bb00 - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + f1868a684ed9766d4247d672fd5f96bba4d4bb00 https://github.com/dotnet/arcade-services @@ -232,9 +232,9 @@ 26ce96327dd346534926c4551f8b8d62a6fc724f - + https://github.com/dotnet/xliff-tasks - 194f32828726c3f1f63f79f3dc09b9e99c157b11 + 0f36b29fb7374379609c3ee6a0b70caf457d8a0e diff --git a/eng/Versions.props b/eng/Versions.props index 8216aada6..b982be8ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.23463.1 + 9.0.0-beta.23504.4 @@ -93,7 +93,7 @@ - 4.8.0-3.23470.12 + 4.8.0-3.23477.1 @@ -111,10 +111,10 @@ - 9.0.0-alpha.1.23456.3 - 9.0.0-alpha.1.23456.3 - 9.0.0-alpha.1.23456.3 - 9.0.0-alpha.1.23456.3 + 9.0.0-alpha.1.23471.7 + 9.0.0-alpha.1.23471.7 + 9.0.0-alpha.1.23471.7 + 9.0.0-alpha.1.23471.7 @@ -126,7 +126,7 @@ - 6.8.0-rc.112 + 6.8.0-rc.122 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 6c4ac6fec..91f8196cc 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.6.0-2" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.7.2-1" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index aa74ab4a8..84cfe7cd9 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -379,13 +379,13 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = } # Minimum VS version to require. - $vsMinVersionReqdStr = '17.6' + $vsMinVersionReqdStr = '17.7' $vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr) # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.6.0-2 - $defaultXCopyMSBuildVersion = '17.6.0-2' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.7.2-1 + $defaultXCopyMSBuildVersion = '17.7.2-1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 44e4a3092..f0db4f0e9 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23463.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23504.4", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23504.4" } } From aa86fa20030095be67c38a902728fa3ecebc5322 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Oct 2023 15:19:07 +0000 Subject: [PATCH 025/109] Update dependencies from https://github.com/dotnet/sdk build 20231005.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23505.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 + eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++------- 3 files changed, 42 insertions(+), 41 deletions(-) diff --git a/NuGet.config b/NuGet.config index 580412928..a86327e94 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f024af91e..08db69e68 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 52e969f93c15d4eaa2f709ebbfe168fb1bb09fa2 + 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/windowsdesktop - 52e969f93c15d4eaa2f709ebbfe168fb1bb09fa2 + 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/windowsdesktop - 52e969f93c15d4eaa2f709ebbfe168fb1bb09fa2 + 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/windowsdesktop - 52e969f93c15d4eaa2f709ebbfe168fb1bb09fa2 + 16efaf8b79a8924f02a8e7500bc7d81d1253007d https://github.com/dotnet/runtime @@ -30,7 +30,7 @@ https://github.com/dotnet/runtime 736dabeca728ccf8b911d96d1b4c575b4d0db7d2 - + https://github.com/dotnet/runtime f8c110b8003d68cc635add4ca791d6cf2e645561 @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 54164e5d98adf5d0ca27d7a44b2e0b6d3fe53f99 + 6a09c8db5526cbf193760fe8d985a969d877476e - + https://github.com/dotnet/sdk - 54164e5d98adf5d0ca27d7a44b2e0b6d3fe53f99 + 6a09c8db5526cbf193760fe8d985a969d877476e - + https://github.com/dotnet/sdk - 54164e5d98adf5d0ca27d7a44b2e0b6d3fe53f99 + 6a09c8db5526cbf193760fe8d985a969d877476e - + https://github.com/dotnet/sdk - 54164e5d98adf5d0ca27d7a44b2e0b6d3fe53f99 + 6a09c8db5526cbf193760fe8d985a969d877476e https://github.com/dotnet/test-templates @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 3a8376ca92de4c85dd92b05fba8a1c0a49b14cb9 - + https://github.com/dotnet/fsharp - 767ffa73e8147418ecf54df376e6685b03efd6e4 + 38b2bac6361e9b75dc2b51c0f2b78b008872767d - + https://github.com/dotnet/fsharp - 767ffa73e8147418ecf54df376e6685b03efd6e4 + 38b2bac6361e9b75dc2b51c0f2b78b008872767d @@ -146,19 +146,19 @@ https://github.com/dotnet/runtime 736dabeca728ccf8b911d96d1b4c575b4d0db7d2 - + https://github.com/dotnet/roslyn - 79963f8a40c6429cd25667c4c62e717b4ca72098 + 81d9274600db701a8b08ed8af3fd6b00a775cc33 - + https://github.com/dotnet/msbuild - 60ae06f6d20616f524a751373aea071df8c2ae48 + 6cdef424154c976f04802b101e6be6292f8a8897 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 @@ -170,15 +170,15 @@ bebe955e9f7d392fbca594b1c76c54ba2e27027e - + https://github.com/dotnet/deployment-tools - 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 + 8babbda6fb22b1410c256bfffed9a8041ff87025 - + https://github.com/dotnet/deployment-tools - 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 + 8babbda6fb22b1410c256bfffed9a8041ff87025 diff --git a/eng/Versions.props b/eng/Versions.props index 0d7f5142b..e37431088 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,16 +84,16 @@ - 9.0.100-alpha.1.23504.15 - 9.0.100-alpha.1.23504.15 - 9.0.100-alpha.1.23504.15 + 9.0.100-alpha.1.23505.1 + 9.0.100-alpha.1.23505.1 + 9.0.100-alpha.1.23505.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23470.12 + 4.8.0-3.23504.4 @@ -111,10 +111,10 @@ - 9.0.0-alpha.1.23456.3 - 9.0.0-alpha.1.23456.3 - 9.0.0-alpha.1.23456.3 - 9.0.0-alpha.1.23456.3 + 9.0.0-alpha.1.23477.3 + 9.0.0-alpha.1.23477.3 + 9.0.0-alpha.1.23477.3 + 9.0.0-alpha.1.23477.3 @@ -126,11 +126,11 @@ - 6.8.0-rc.112 + 6.8.0-rc.122 - 2.0.0-preview.1.23463.1 + 2.0.0-preview.1.23478.2 From 97f065235092e6f40a1c7013fde8fe276cdea9fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Oct 2023 16:04:47 +0000 Subject: [PATCH 026/109] Update dependencies from https://github.com/dotnet/sdk build 20231005.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23505.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 - eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index a86327e94..580412928 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08db69e68..33fe763c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 6a09c8db5526cbf193760fe8d985a969d877476e + 269b9ebd90f6ab0611095d4d3bea5243db65b9bb - + https://github.com/dotnet/sdk - 6a09c8db5526cbf193760fe8d985a969d877476e + 269b9ebd90f6ab0611095d4d3bea5243db65b9bb - + https://github.com/dotnet/sdk - 6a09c8db5526cbf193760fe8d985a969d877476e + 269b9ebd90f6ab0611095d4d3bea5243db65b9bb - + https://github.com/dotnet/sdk - 6a09c8db5526cbf193760fe8d985a969d877476e + 269b9ebd90f6ab0611095d4d3bea5243db65b9bb https://github.com/dotnet/test-templates @@ -151,9 +151,9 @@ 81d9274600db701a8b08ed8af3fd6b00a775cc33 - + https://github.com/dotnet/msbuild - 6cdef424154c976f04802b101e6be6292f8a8897 + 0df5d85ae9085efe4e71fce992b268e70659a14a diff --git a/eng/Versions.props b/eng/Versions.props index e37431088..3db4007b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23505.1 - 9.0.100-alpha.1.23505.1 - 9.0.100-alpha.1.23505.1 + 9.0.100-alpha.1.23505.2 + 9.0.100-alpha.1.23505.2 + 9.0.100-alpha.1.23505.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d774b6b15bc62488494b5dc72e77ccad68e77934 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Oct 2023 19:51:49 +0000 Subject: [PATCH 027/109] Update dependencies from https://github.com/dotnet/sdk build 20231005.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23505.8 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.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 33fe763c6..1447b748e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 269b9ebd90f6ab0611095d4d3bea5243db65b9bb + 4a1ffab37158144f8b1bc5995241b7ace7aa19ea - + https://github.com/dotnet/sdk - 269b9ebd90f6ab0611095d4d3bea5243db65b9bb + 4a1ffab37158144f8b1bc5995241b7ace7aa19ea - + https://github.com/dotnet/sdk - 269b9ebd90f6ab0611095d4d3bea5243db65b9bb + 4a1ffab37158144f8b1bc5995241b7ace7aa19ea - + https://github.com/dotnet/sdk - 269b9ebd90f6ab0611095d4d3bea5243db65b9bb + 4a1ffab37158144f8b1bc5995241b7ace7aa19ea https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 3db4007b3..6f76825c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23505.2 - 9.0.100-alpha.1.23505.2 - 9.0.100-alpha.1.23505.2 + 9.0.100-alpha.1.23505.8 + 9.0.100-alpha.1.23505.8 + 9.0.100-alpha.1.23505.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8f408b356f1a106cb672f7946332baa7bcb17e73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Oct 2023 00:02:25 +0000 Subject: [PATCH 028/109] Update dependencies from https://github.com/dotnet/sdk build 20231005.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23505.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.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 1447b748e..2124ad2eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 4a1ffab37158144f8b1bc5995241b7ace7aa19ea + 448f918b28c8a7b60c50650b9d244b13af40e4f2 - + https://github.com/dotnet/sdk - 4a1ffab37158144f8b1bc5995241b7ace7aa19ea + 448f918b28c8a7b60c50650b9d244b13af40e4f2 - + https://github.com/dotnet/sdk - 4a1ffab37158144f8b1bc5995241b7ace7aa19ea + 448f918b28c8a7b60c50650b9d244b13af40e4f2 - + https://github.com/dotnet/sdk - 4a1ffab37158144f8b1bc5995241b7ace7aa19ea + 448f918b28c8a7b60c50650b9d244b13af40e4f2 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 6f76825c1..fce4e51cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23505.8 - 9.0.100-alpha.1.23505.8 - 9.0.100-alpha.1.23505.8 + 9.0.100-alpha.1.23505.12 + 9.0.100-alpha.1.23505.12 + 9.0.100-alpha.1.23505.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 641d0a25a59a9729551aeb4d2d9551e76bf37352 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Oct 2023 02:39:53 +0000 Subject: [PATCH 029/109] Update dependencies from https://github.com/dotnet/sdk build 20231005.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23505.16 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.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 2124ad2eb..94ae214e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 448f918b28c8a7b60c50650b9d244b13af40e4f2 + f474e6845caa8c12bf7fb68757927187adbe50bf - + https://github.com/dotnet/sdk - 448f918b28c8a7b60c50650b9d244b13af40e4f2 + f474e6845caa8c12bf7fb68757927187adbe50bf - + https://github.com/dotnet/sdk - 448f918b28c8a7b60c50650b9d244b13af40e4f2 + f474e6845caa8c12bf7fb68757927187adbe50bf - + https://github.com/dotnet/sdk - 448f918b28c8a7b60c50650b9d244b13af40e4f2 + f474e6845caa8c12bf7fb68757927187adbe50bf https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index fce4e51cc..2b544f289 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23505.12 - 9.0.100-alpha.1.23505.12 - 9.0.100-alpha.1.23505.12 + 9.0.100-alpha.1.23505.16 + 9.0.100-alpha.1.23505.16 + 9.0.100-alpha.1.23505.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d86423096af883f060ffae0d05dfff55b6696047 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Oct 2023 12:16:51 +0000 Subject: [PATCH 030/109] Update dependencies from https://github.com/dotnet/arcade build 20231006.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23506.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ccff8db3b..75d1305e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,18 +202,18 @@ - + https://github.com/dotnet/arcade - f1868a684ed9766d4247d672fd5f96bba4d4bb00 + c5245c4f1d1074087d6bd0e5b311dc9544729172 - + https://github.com/dotnet/arcade - f1868a684ed9766d4247d672fd5f96bba4d4bb00 + c5245c4f1d1074087d6bd0e5b311dc9544729172 - + https://github.com/dotnet/arcade - f1868a684ed9766d4247d672fd5f96bba4d4bb00 + c5245c4f1d1074087d6bd0e5b311dc9544729172 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index b982be8ab..173d308a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.23504.4 + 9.0.0-beta.23506.1 diff --git a/global.json b/global.json index f0db4f0e9..49bc88781 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23504.4", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23504.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23506.1", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23506.1" } } From 4b80839aa25eb7800d1be586228bb10169136ffe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Oct 2023 17:53:21 +0000 Subject: [PATCH 031/109] Update dependencies from https://github.com/dotnet/sdk build 20231006.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23506.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (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 94ae214e5..48fa29015 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - f474e6845caa8c12bf7fb68757927187adbe50bf + 04e7bfd855ec161fd171ded61cde4227e6192395 - + https://github.com/dotnet/sdk - f474e6845caa8c12bf7fb68757927187adbe50bf + 04e7bfd855ec161fd171ded61cde4227e6192395 - + https://github.com/dotnet/sdk - f474e6845caa8c12bf7fb68757927187adbe50bf + 04e7bfd855ec161fd171ded61cde4227e6192395 - + https://github.com/dotnet/sdk - f474e6845caa8c12bf7fb68757927187adbe50bf + 04e7bfd855ec161fd171ded61cde4227e6192395 https://github.com/dotnet/test-templates @@ -137,9 +137,9 @@ 38b2bac6361e9b75dc2b51c0f2b78b008872767d - + https://github.com/microsoft/vstest - cf7d549fc0197abaabec19d61d2c20d7a7b089f8 + 8b75bc5d019f69733c6c0ef6bdd598f5b557c4cd diff --git a/eng/Versions.props b/eng/Versions.props index 2b544f289..ef2727203 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23505.16 - 9.0.100-alpha.1.23505.16 - 9.0.100-alpha.1.23505.16 + 9.0.100-alpha.1.23506.3 + 9.0.100-alpha.1.23506.3 + 9.0.100-alpha.1.23506.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -241,7 +241,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-release-23468-02 + 17.9.0-preview-23503-02 8.0.0-alpha.1.22557.12 8.0.0-preview.23424.2 From f686d1938fd76539039cb511037e4e1fedec6eef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Oct 2023 19:12:58 +0000 Subject: [PATCH 032/109] Update dependencies from https://github.com/dotnet/sdk build 20231006.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23506.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.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 48fa29015..c4ee12e5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 04e7bfd855ec161fd171ded61cde4227e6192395 + fff7ca9a519f848e774ee9a50418d8a3b3bc2f48 - + https://github.com/dotnet/sdk - 04e7bfd855ec161fd171ded61cde4227e6192395 + fff7ca9a519f848e774ee9a50418d8a3b3bc2f48 - + https://github.com/dotnet/sdk - 04e7bfd855ec161fd171ded61cde4227e6192395 + fff7ca9a519f848e774ee9a50418d8a3b3bc2f48 - + https://github.com/dotnet/sdk - 04e7bfd855ec161fd171ded61cde4227e6192395 + fff7ca9a519f848e774ee9a50418d8a3b3bc2f48 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ef2727203..0e1dba8dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23506.3 - 9.0.100-alpha.1.23506.3 - 9.0.100-alpha.1.23506.3 + 9.0.100-alpha.1.23506.6 + 9.0.100-alpha.1.23506.6 + 9.0.100-alpha.1.23506.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5541529921a5ae0b20b42c4b6db4b1aa636fec98 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Oct 2023 20:06:43 +0000 Subject: [PATCH 033/109] Update dependencies from https://github.com/dotnet/sdk build 20231006.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23506.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (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 c4ee12e5c..da8192cf2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - fff7ca9a519f848e774ee9a50418d8a3b3bc2f48 + 08c4fdc8b41386155c93cb2dbdd3a139aa2c348c - + https://github.com/dotnet/sdk - fff7ca9a519f848e774ee9a50418d8a3b3bc2f48 + 08c4fdc8b41386155c93cb2dbdd3a139aa2c348c - + https://github.com/dotnet/sdk - fff7ca9a519f848e774ee9a50418d8a3b3bc2f48 + 08c4fdc8b41386155c93cb2dbdd3a139aa2c348c - + https://github.com/dotnet/sdk - fff7ca9a519f848e774ee9a50418d8a3b3bc2f48 + 08c4fdc8b41386155c93cb2dbdd3a139aa2c348c https://github.com/dotnet/test-templates @@ -151,9 +151,9 @@ 81d9274600db701a8b08ed8af3fd6b00a775cc33 - + https://github.com/dotnet/msbuild - 0df5d85ae9085efe4e71fce992b268e70659a14a + 01bf0f2cf0a19b2c064947fba40eae80c1125fb3 diff --git a/eng/Versions.props b/eng/Versions.props index 0e1dba8dd..4ace478d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23506.6 - 9.0.100-alpha.1.23506.6 - 9.0.100-alpha.1.23506.6 + 9.0.100-alpha.1.23506.9 + 9.0.100-alpha.1.23506.9 + 9.0.100-alpha.1.23506.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c38da62a3781c76899685f8b224f7bba4914a217 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 Oct 2023 12:15:58 +0000 Subject: [PATCH 034/109] Update dependencies from https://github.com/dotnet/arcade build 20231006.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23506.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75d1305e9..807035e6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,18 +202,18 @@ - + https://github.com/dotnet/arcade - c5245c4f1d1074087d6bd0e5b311dc9544729172 + 1bb0c0184e96b4f2f05d78f117e8805e00d6ae42 - + https://github.com/dotnet/arcade - c5245c4f1d1074087d6bd0e5b311dc9544729172 + 1bb0c0184e96b4f2f05d78f117e8805e00d6ae42 - + https://github.com/dotnet/arcade - c5245c4f1d1074087d6bd0e5b311dc9544729172 + 1bb0c0184e96b4f2f05d78f117e8805e00d6ae42 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 173d308a3..bf1a99a01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.23506.1 + 9.0.0-beta.23506.2 diff --git a/global.json b/global.json index 49bc88781..431bf6327 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23506.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23506.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23506.2", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23506.2" } } From 283ce202f032051977d1522c584496ac096f6282 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 8 Oct 2023 06:14:28 +0000 Subject: [PATCH 035/109] Update dependencies from https://github.com/dotnet/sdk build 20231007.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23507.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da8192cf2..ab8450f12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/runtime - 736dabeca728ccf8b911d96d1b4c575b4d0db7d2 + 6370dfe4c727dc0a3c3d5cf8cefce4fbaaa2f539 - + https://github.com/dotnet/runtime - 736dabeca728ccf8b911d96d1b4c575b4d0db7d2 + 6370dfe4c727dc0a3c3d5cf8cefce4fbaaa2f539 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 6370dfe4c727dc0a3c3d5cf8cefce4fbaaa2f539 - + https://github.com/dotnet/runtime - 736dabeca728ccf8b911d96d1b4c575b4d0db7d2 + 6370dfe4c727dc0a3c3d5cf8cefce4fbaaa2f539 - + https://github.com/dotnet/runtime - 736dabeca728ccf8b911d96d1b4c575b4d0db7d2 + 6370dfe4c727dc0a3c3d5cf8cefce4fbaaa2f539 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 736dabeca728ccf8b911d96d1b4c575b4d0db7d2 + 6370dfe4c727dc0a3c3d5cf8cefce4fbaaa2f539 https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 08c4fdc8b41386155c93cb2dbdd3a139aa2c348c + 4f8bf40c705670faa965ef38f6685dda1aba8c56 - + https://github.com/dotnet/sdk - 08c4fdc8b41386155c93cb2dbdd3a139aa2c348c + 4f8bf40c705670faa965ef38f6685dda1aba8c56 - + https://github.com/dotnet/sdk - 08c4fdc8b41386155c93cb2dbdd3a139aa2c348c + 4f8bf40c705670faa965ef38f6685dda1aba8c56 - + https://github.com/dotnet/sdk - 08c4fdc8b41386155c93cb2dbdd3a139aa2c348c + 4f8bf40c705670faa965ef38f6685dda1aba8c56 https://github.com/dotnet/test-templates @@ -142,9 +142,9 @@ 8b75bc5d019f69733c6c0ef6bdd598f5b557c4cd - + https://github.com/dotnet/runtime - 736dabeca728ccf8b911d96d1b4c575b4d0db7d2 + 6370dfe4c727dc0a3c3d5cf8cefce4fbaaa2f539 https://github.com/dotnet/roslyn @@ -165,9 +165,9 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - bebe955e9f7d392fbca594b1c76c54ba2e27027e + 97568ad0e2120f194df7ac3895e9589fcc8a255b diff --git a/eng/Versions.props b/eng/Versions.props index 4ace478d5..624a1fb55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23506.9 - 9.0.100-alpha.1.23506.9 - 9.0.100-alpha.1.23506.9 + 9.0.100-alpha.1.23507.2 + 9.0.100-alpha.1.23507.2 + 9.0.100-alpha.1.23507.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -97,15 +97,15 @@ - 9.0.0-alpha.1.23470.17 + 9.0.0-alpha.1.23507.4 - 9.0.0-alpha.1.23470.17 - 9.0.0-alpha.1.23470.17 - 9.0.0-alpha.1.23470.17 - 9.0.0-alpha.1.23470.17 - 9.0.0-alpha.1.23470.17 + 9.0.0-alpha.1.23507.4 + 9.0.0-alpha.1.23507.4 + 9.0.0-alpha.1.23507.4 + 9.0.0-alpha.1.23507.4 + 9.0.0-alpha.1.23507.4 8.0.0-rc.1.23414.4 2.1.0 @@ -255,7 +255,7 @@ 13.3.8646-net8-p6 16.4.8646-net8-p6 - 9.0.0-alpha.1.23465.3 + 9.0.0-alpha.1.23507.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From 91d4e5b1fafbe15484f755425d16ae7b3ad63055 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 8 Oct 2023 09:58:21 +0000 Subject: [PATCH 036/109] Update dependencies from https://github.com/dotnet/sdk build 20231008.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23508.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab8450f12..f7b9add68 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/runtime - 6370dfe4c727dc0a3c3d5cf8cefce4fbaaa2f539 + 551a4db7917df8c321867d47ce028c726106a3c2 - + https://github.com/dotnet/runtime - 6370dfe4c727dc0a3c3d5cf8cefce4fbaaa2f539 + 551a4db7917df8c321867d47ce028c726106a3c2 - + https://github.com/dotnet/runtime - 6370dfe4c727dc0a3c3d5cf8cefce4fbaaa2f539 + 551a4db7917df8c321867d47ce028c726106a3c2 - + https://github.com/dotnet/runtime - 6370dfe4c727dc0a3c3d5cf8cefce4fbaaa2f539 + 551a4db7917df8c321867d47ce028c726106a3c2 - + https://github.com/dotnet/runtime - 6370dfe4c727dc0a3c3d5cf8cefce4fbaaa2f539 + 551a4db7917df8c321867d47ce028c726106a3c2 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 6370dfe4c727dc0a3c3d5cf8cefce4fbaaa2f539 + 551a4db7917df8c321867d47ce028c726106a3c2 https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 4f8bf40c705670faa965ef38f6685dda1aba8c56 + f377ba6ccb20848480d0ab453eee22af4ed3bbd6 - + https://github.com/dotnet/sdk - 4f8bf40c705670faa965ef38f6685dda1aba8c56 + f377ba6ccb20848480d0ab453eee22af4ed3bbd6 - + https://github.com/dotnet/sdk - 4f8bf40c705670faa965ef38f6685dda1aba8c56 + f377ba6ccb20848480d0ab453eee22af4ed3bbd6 - + https://github.com/dotnet/sdk - 4f8bf40c705670faa965ef38f6685dda1aba8c56 + f377ba6ccb20848480d0ab453eee22af4ed3bbd6 https://github.com/dotnet/test-templates @@ -142,9 +142,9 @@ 8b75bc5d019f69733c6c0ef6bdd598f5b557c4cd - + https://github.com/dotnet/runtime - 6370dfe4c727dc0a3c3d5cf8cefce4fbaaa2f539 + 551a4db7917df8c321867d47ce028c726106a3c2 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 624a1fb55..1df5f545c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23507.2 - 9.0.100-alpha.1.23507.2 - 9.0.100-alpha.1.23507.2 + 9.0.100-alpha.1.23508.1 + 9.0.100-alpha.1.23508.1 + 9.0.100-alpha.1.23508.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -97,15 +97,15 @@ - 9.0.0-alpha.1.23507.4 + 9.0.0-alpha.1.23507.5 - 9.0.0-alpha.1.23507.4 - 9.0.0-alpha.1.23507.4 - 9.0.0-alpha.1.23507.4 - 9.0.0-alpha.1.23507.4 - 9.0.0-alpha.1.23507.4 + 9.0.0-alpha.1.23507.5 + 9.0.0-alpha.1.23507.5 + 9.0.0-alpha.1.23507.5 + 9.0.0-alpha.1.23507.5 + 9.0.0-alpha.1.23507.5 8.0.0-rc.1.23414.4 2.1.0 From 7601a20e37a265825b9b04a53f4781f02257ed9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 8 Oct 2023 12:15:23 +0000 Subject: [PATCH 037/109] Update dependencies from https://github.com/dotnet/arcade build 20231006.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23506.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk From 7257cc38da6a4097abf3b01441131435ff1fbc44 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Sun, 8 Oct 2023 15:18:11 +0000 Subject: [PATCH 038/109] Update xunit version --- .../Microsoft.DotNet.SourceBuild.SmokeTests.csproj | 4 ++-- .../Microsoft.DotNet.Tools.Tests.Utilities.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj index c491778a8..7dea9a19c 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj @@ -11,8 +11,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj index 27da1cfb8..989ab06c9 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj @@ -5,7 +5,7 @@ - + From 379e34cca6309f8d1af8414e78304cd417883ac2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 8 Oct 2023 15:21:29 +0000 Subject: [PATCH 039/109] Update dependencies from https://github.com/dotnet/sdk build 20231008.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23508.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c91afe39..462f8829c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/runtime - 551a4db7917df8c321867d47ce028c726106a3c2 + f0208617e3c4f2e222adefa0b249d3af61400029 - + https://github.com/dotnet/runtime - 551a4db7917df8c321867d47ce028c726106a3c2 + f0208617e3c4f2e222adefa0b249d3af61400029 - + https://github.com/dotnet/runtime - 551a4db7917df8c321867d47ce028c726106a3c2 + f0208617e3c4f2e222adefa0b249d3af61400029 - + https://github.com/dotnet/runtime - 551a4db7917df8c321867d47ce028c726106a3c2 + f0208617e3c4f2e222adefa0b249d3af61400029 - + https://github.com/dotnet/runtime - 551a4db7917df8c321867d47ce028c726106a3c2 + f0208617e3c4f2e222adefa0b249d3af61400029 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 551a4db7917df8c321867d47ce028c726106a3c2 + f0208617e3c4f2e222adefa0b249d3af61400029 https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - f377ba6ccb20848480d0ab453eee22af4ed3bbd6 + 350d39ef9cbb3b81783e83027e6889b50c7c764f - + https://github.com/dotnet/sdk - f377ba6ccb20848480d0ab453eee22af4ed3bbd6 + 350d39ef9cbb3b81783e83027e6889b50c7c764f - + https://github.com/dotnet/sdk - f377ba6ccb20848480d0ab453eee22af4ed3bbd6 + 350d39ef9cbb3b81783e83027e6889b50c7c764f - + https://github.com/dotnet/sdk - f377ba6ccb20848480d0ab453eee22af4ed3bbd6 + 350d39ef9cbb3b81783e83027e6889b50c7c764f https://github.com/dotnet/test-templates @@ -142,9 +142,9 @@ 8b75bc5d019f69733c6c0ef6bdd598f5b557c4cd - + https://github.com/dotnet/runtime - 551a4db7917df8c321867d47ce028c726106a3c2 + f0208617e3c4f2e222adefa0b249d3af61400029 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index f1c36e11f..e743cada3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23508.1 - 9.0.100-alpha.1.23508.1 - 9.0.100-alpha.1.23508.1 + 9.0.100-alpha.1.23508.2 + 9.0.100-alpha.1.23508.2 + 9.0.100-alpha.1.23508.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -97,15 +97,15 @@ - 9.0.0-alpha.1.23507.5 + 9.0.0-alpha.1.23508.1 - 9.0.0-alpha.1.23507.5 - 9.0.0-alpha.1.23507.5 - 9.0.0-alpha.1.23507.5 - 9.0.0-alpha.1.23507.5 - 9.0.0-alpha.1.23507.5 + 9.0.0-alpha.1.23508.1 + 9.0.0-alpha.1.23508.1 + 9.0.0-alpha.1.23508.1 + 9.0.0-alpha.1.23508.1 + 9.0.0-alpha.1.23508.1 8.0.0-rc.1.23414.4 2.1.0 From 707317cdd2cb507c9347d252f8336bb70876b402 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 Oct 2023 10:05:18 +0000 Subject: [PATCH 040/109] Update dependencies from https://github.com/dotnet/sdk build 20231009.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23509.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 462f8829c..ed325b8ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/runtime - f0208617e3c4f2e222adefa0b249d3af61400029 + 26a809adb958c604ac773d39f2c253cf0dd12e1e - + https://github.com/dotnet/runtime - f0208617e3c4f2e222adefa0b249d3af61400029 + 26a809adb958c604ac773d39f2c253cf0dd12e1e - + https://github.com/dotnet/runtime - f0208617e3c4f2e222adefa0b249d3af61400029 + 26a809adb958c604ac773d39f2c253cf0dd12e1e - + https://github.com/dotnet/runtime - f0208617e3c4f2e222adefa0b249d3af61400029 + 26a809adb958c604ac773d39f2c253cf0dd12e1e - + https://github.com/dotnet/runtime - f0208617e3c4f2e222adefa0b249d3af61400029 + 26a809adb958c604ac773d39f2c253cf0dd12e1e @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - f0208617e3c4f2e222adefa0b249d3af61400029 + 26a809adb958c604ac773d39f2c253cf0dd12e1e https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 350d39ef9cbb3b81783e83027e6889b50c7c764f + f5c3fbcf93419efd197fd22652d035803d9d4ebe - + https://github.com/dotnet/sdk - 350d39ef9cbb3b81783e83027e6889b50c7c764f + f5c3fbcf93419efd197fd22652d035803d9d4ebe - + https://github.com/dotnet/sdk - 350d39ef9cbb3b81783e83027e6889b50c7c764f + f5c3fbcf93419efd197fd22652d035803d9d4ebe - + https://github.com/dotnet/sdk - 350d39ef9cbb3b81783e83027e6889b50c7c764f + f5c3fbcf93419efd197fd22652d035803d9d4ebe https://github.com/dotnet/test-templates @@ -142,9 +142,9 @@ 8b75bc5d019f69733c6c0ef6bdd598f5b557c4cd - + https://github.com/dotnet/runtime - f0208617e3c4f2e222adefa0b249d3af61400029 + 26a809adb958c604ac773d39f2c253cf0dd12e1e https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index e743cada3..d7d11c5fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23508.2 - 9.0.100-alpha.1.23508.2 - 9.0.100-alpha.1.23508.2 + 9.0.100-alpha.1.23509.1 + 9.0.100-alpha.1.23509.1 + 9.0.100-alpha.1.23509.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -97,15 +97,15 @@ - 9.0.0-alpha.1.23508.1 + 9.0.0-alpha.1.23508.5 - 9.0.0-alpha.1.23508.1 - 9.0.0-alpha.1.23508.1 - 9.0.0-alpha.1.23508.1 - 9.0.0-alpha.1.23508.1 - 9.0.0-alpha.1.23508.1 + 9.0.0-alpha.1.23508.5 + 9.0.0-alpha.1.23508.5 + 9.0.0-alpha.1.23508.5 + 9.0.0-alpha.1.23508.5 + 9.0.0-alpha.1.23508.5 8.0.0-rc.1.23414.4 2.1.0 From d33827ac5a733c6b335810dac8edefb01345e5e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 Oct 2023 10:54:50 +0000 Subject: [PATCH 041/109] Update dependencies from https://github.com/dotnet/sdk build 20231009.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23509.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (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 ed325b8ba..a93ddc211 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - f5c3fbcf93419efd197fd22652d035803d9d4ebe + d2fbf2451e53ace2b2e5f4db6b3b98713ef8bb9c - + https://github.com/dotnet/sdk - f5c3fbcf93419efd197fd22652d035803d9d4ebe + d2fbf2451e53ace2b2e5f4db6b3b98713ef8bb9c - + https://github.com/dotnet/sdk - f5c3fbcf93419efd197fd22652d035803d9d4ebe + d2fbf2451e53ace2b2e5f4db6b3b98713ef8bb9c - + https://github.com/dotnet/sdk - f5c3fbcf93419efd197fd22652d035803d9d4ebe + d2fbf2451e53ace2b2e5f4db6b3b98713ef8bb9c https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 26a809adb958c604ac773d39f2c253cf0dd12e1e - + https://github.com/dotnet/roslyn - 81d9274600db701a8b08ed8af3fd6b00a775cc33 + 0caa880a161057559d1dcaad890e4053f520136e diff --git a/eng/Versions.props b/eng/Versions.props index d7d11c5fe..bf4f8b4b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,16 +84,16 @@ - 9.0.100-alpha.1.23509.1 - 9.0.100-alpha.1.23509.1 - 9.0.100-alpha.1.23509.1 + 9.0.100-alpha.1.23509.2 + 9.0.100-alpha.1.23509.2 + 9.0.100-alpha.1.23509.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23504.4 + 4.9.0-1.23506.7 From fb77aac56ec518ab3904c7a0fc8275b237352c29 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 Oct 2023 12:16:28 +0000 Subject: [PATCH 042/109] Update dependencies from https://github.com/dotnet/arcade build 20231008.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23508.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 807035e6e..aad70f8c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,18 +202,18 @@ - + https://github.com/dotnet/arcade - 1bb0c0184e96b4f2f05d78f117e8805e00d6ae42 + 822f095b8c815dd7b9161140a9ff8151de593f82 - + https://github.com/dotnet/arcade - 1bb0c0184e96b4f2f05d78f117e8805e00d6ae42 + 822f095b8c815dd7b9161140a9ff8151de593f82 - + https://github.com/dotnet/arcade - 1bb0c0184e96b4f2f05d78f117e8805e00d6ae42 + 822f095b8c815dd7b9161140a9ff8151de593f82 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index bf1a99a01..f4b12f31f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.23506.2 + 9.0.0-beta.23508.1 diff --git a/global.json b/global.json index 431bf6327..adaaa9ecf 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23506.2", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23506.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23508.1", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23508.1" } } From da298f947c5216ef761501a5b6f5cce46e27df7f Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 9 Oct 2023 08:29:14 -0500 Subject: [PATCH 043/109] Remove SB tag in Microsoft.Build dependency due to stable versioning change --- eng/Version.Details.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aad70f8c6..e6da0805f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -154,7 +154,6 @@ https://github.com/dotnet/msbuild 6cdef424154c976f04802b101e6be6292f8a8897 - https://github.com/nuget/nuget.client From 7cc75e6de35b19c6e0873da387767bbc7104994e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 Oct 2023 15:43:22 +0000 Subject: [PATCH 044/109] Update dependencies from https://github.com/dotnet/arcade build 20231009.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23509.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e6da0805f..d563cc0e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,18 +201,18 @@ - + https://github.com/dotnet/arcade - 822f095b8c815dd7b9161140a9ff8151de593f82 + 409c628cd763217675516249dc35c0d93d69faa9 - + https://github.com/dotnet/arcade - 822f095b8c815dd7b9161140a9ff8151de593f82 + 409c628cd763217675516249dc35c0d93d69faa9 - + https://github.com/dotnet/arcade - 822f095b8c815dd7b9161140a9ff8151de593f82 + 409c628cd763217675516249dc35c0d93d69faa9 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index f4b12f31f..c60805faf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.23508.1 + 9.0.0-beta.23509.1 diff --git a/global.json b/global.json index adaaa9ecf..4f4c06183 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23508.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23508.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23509.1", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23509.1" } } From a2439fd766a1fa88d82491ee72065f7e2861a8ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 Oct 2023 17:45:28 +0000 Subject: [PATCH 045/109] Update dependencies from https://github.com/dotnet/arcade build 20231009.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23509.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d563cc0e0..4af01d1d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,18 +201,18 @@ - + https://github.com/dotnet/arcade - 409c628cd763217675516249dc35c0d93d69faa9 + 2d645dfc84d92b888d117c49ab4ec1e5c5ed90b2 - + https://github.com/dotnet/arcade - 409c628cd763217675516249dc35c0d93d69faa9 + 2d645dfc84d92b888d117c49ab4ec1e5c5ed90b2 - + https://github.com/dotnet/arcade - 409c628cd763217675516249dc35c0d93d69faa9 + 2d645dfc84d92b888d117c49ab4ec1e5c5ed90b2 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index c60805faf..f0cb451ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.23509.1 + 9.0.0-beta.23509.2 diff --git a/global.json b/global.json index 4f4c06183..e2b168228 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23509.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23509.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23509.2", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23509.2" } } From 976da685f3854d58dc4ee3cc3ed10b19984f3462 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 Oct 2023 19:21:51 +0000 Subject: [PATCH 046/109] Update dependencies from https://github.com/dotnet/sdk build 20231009.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23509.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a93ddc211..c5cf1b305 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/runtime - 26a809adb958c604ac773d39f2c253cf0dd12e1e + 218384f2c97288692ba9aac7e11b00961d7d7a98 - + https://github.com/dotnet/runtime - 26a809adb958c604ac773d39f2c253cf0dd12e1e + 218384f2c97288692ba9aac7e11b00961d7d7a98 - + https://github.com/dotnet/runtime - 26a809adb958c604ac773d39f2c253cf0dd12e1e + 218384f2c97288692ba9aac7e11b00961d7d7a98 - + https://github.com/dotnet/runtime - 26a809adb958c604ac773d39f2c253cf0dd12e1e + 218384f2c97288692ba9aac7e11b00961d7d7a98 - + https://github.com/dotnet/runtime - 26a809adb958c604ac773d39f2c253cf0dd12e1e + 218384f2c97288692ba9aac7e11b00961d7d7a98 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 26a809adb958c604ac773d39f2c253cf0dd12e1e + 218384f2c97288692ba9aac7e11b00961d7d7a98 https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - d2fbf2451e53ace2b2e5f4db6b3b98713ef8bb9c + 3240926d67ed32437edc86a8544c982c0368e810 - + https://github.com/dotnet/sdk - d2fbf2451e53ace2b2e5f4db6b3b98713ef8bb9c + 3240926d67ed32437edc86a8544c982c0368e810 - + https://github.com/dotnet/sdk - d2fbf2451e53ace2b2e5f4db6b3b98713ef8bb9c + 3240926d67ed32437edc86a8544c982c0368e810 - + https://github.com/dotnet/sdk - d2fbf2451e53ace2b2e5f4db6b3b98713ef8bb9c + 3240926d67ed32437edc86a8544c982c0368e810 https://github.com/dotnet/test-templates @@ -142,9 +142,9 @@ 8b75bc5d019f69733c6c0ef6bdd598f5b557c4cd - + https://github.com/dotnet/runtime - 26a809adb958c604ac773d39f2c253cf0dd12e1e + 218384f2c97288692ba9aac7e11b00961d7d7a98 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index bf4f8b4b3..2c8b4b079 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23509.2 - 9.0.100-alpha.1.23509.2 - 9.0.100-alpha.1.23509.2 + 9.0.100-alpha.1.23509.5 + 9.0.100-alpha.1.23509.5 + 9.0.100-alpha.1.23509.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -97,15 +97,15 @@ - 9.0.0-alpha.1.23508.5 + 9.0.0-alpha.1.23509.2 - 9.0.0-alpha.1.23508.5 - 9.0.0-alpha.1.23508.5 - 9.0.0-alpha.1.23508.5 - 9.0.0-alpha.1.23508.5 - 9.0.0-alpha.1.23508.5 + 9.0.0-alpha.1.23509.2 + 9.0.0-alpha.1.23509.2 + 9.0.0-alpha.1.23509.2 + 9.0.0-alpha.1.23509.2 + 9.0.0-alpha.1.23509.2 8.0.0-rc.1.23414.4 2.1.0 From 2923c4ffb1a259501a7054ae96ef417d486fe57a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 9 Oct 2023 15:18:27 -0700 Subject: [PATCH 047/109] Fix the ilcompiler rid support ordering --- src/redist/targets/GenerateBundledVersions.targets | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 80082d771..22b77ce12 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -335,16 +335,16 @@ win-x64; " /> - - - + + Date: Mon, 9 Oct 2023 22:29:33 +0000 Subject: [PATCH 048/109] Update dependencies from https://github.com/dotnet/sdk build 20231009.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23509.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.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 c5cf1b305..d8d7dae35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 3240926d67ed32437edc86a8544c982c0368e810 + 73268c7e9b775bcb544e6506106779ec14a660bf - + https://github.com/dotnet/sdk - 3240926d67ed32437edc86a8544c982c0368e810 + 73268c7e9b775bcb544e6506106779ec14a660bf - + https://github.com/dotnet/sdk - 3240926d67ed32437edc86a8544c982c0368e810 + 73268c7e9b775bcb544e6506106779ec14a660bf - + https://github.com/dotnet/sdk - 3240926d67ed32437edc86a8544c982c0368e810 + 73268c7e9b775bcb544e6506106779ec14a660bf https://github.com/dotnet/test-templates @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 3a8376ca92de4c85dd92b05fba8a1c0a49b14cb9 - + https://github.com/dotnet/fsharp - 38b2bac6361e9b75dc2b51c0f2b78b008872767d + 39ef9ca10f63a99de12f9b348a877d32c6446857 - + https://github.com/dotnet/fsharp - 38b2bac6361e9b75dc2b51c0f2b78b008872767d + 39ef9ca10f63a99de12f9b348a877d32c6446857 diff --git a/eng/Versions.props b/eng/Versions.props index 2c8b4b079..fc89d3e93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23509.5 - 9.0.100-alpha.1.23509.5 - 9.0.100-alpha.1.23509.5 + 9.0.100-alpha.1.23509.6 + 9.0.100-alpha.1.23509.6 + 9.0.100-alpha.1.23509.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 81ba11161284785875101890d307dc7fbb3cc373 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Oct 2023 03:09:55 +0000 Subject: [PATCH 049/109] Update dependencies from https://github.com/dotnet/sdk build 20231009.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23509.10 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (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 d8d7dae35..9e30701ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 73268c7e9b775bcb544e6506106779ec14a660bf + 040213756b5410297bba7d4f38ddbd6869821c8f - + https://github.com/dotnet/sdk - 73268c7e9b775bcb544e6506106779ec14a660bf + 040213756b5410297bba7d4f38ddbd6869821c8f - + https://github.com/dotnet/sdk - 73268c7e9b775bcb544e6506106779ec14a660bf + 040213756b5410297bba7d4f38ddbd6869821c8f - + https://github.com/dotnet/sdk - 73268c7e9b775bcb544e6506106779ec14a660bf + 040213756b5410297bba7d4f38ddbd6869821c8f https://github.com/dotnet/test-templates @@ -137,9 +137,9 @@ 39ef9ca10f63a99de12f9b348a877d32c6446857 - + https://github.com/microsoft/vstest - 8b75bc5d019f69733c6c0ef6bdd598f5b557c4cd + 00c72706ecc6d95e1e5c7c5a9d27990ebe16c9b8 diff --git a/eng/Versions.props b/eng/Versions.props index fc89d3e93..4df52943f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23509.6 - 9.0.100-alpha.1.23509.6 - 9.0.100-alpha.1.23509.6 + 9.0.100-alpha.1.23509.10 + 9.0.100-alpha.1.23509.10 + 9.0.100-alpha.1.23509.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -238,7 +238,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23503-02 + 17.9.0-preview-23506-01 8.0.0-alpha.1.22557.12 8.0.0-preview.23424.2 From 1478f9a9db372f04996a536a6eada326362d5713 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Oct 2023 06:57:02 +0000 Subject: [PATCH 050/109] Update dependencies from https://github.com/dotnet/arcade build 20231009.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23509.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4af01d1d8..44e962c5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,18 +201,18 @@ - + https://github.com/dotnet/arcade - 2d645dfc84d92b888d117c49ab4ec1e5c5ed90b2 + 3fe889b2724f312ba0dec7c01d85e9257e38818e - + https://github.com/dotnet/arcade - 2d645dfc84d92b888d117c49ab4ec1e5c5ed90b2 + 3fe889b2724f312ba0dec7c01d85e9257e38818e - + https://github.com/dotnet/arcade - 2d645dfc84d92b888d117c49ab4ec1e5c5ed90b2 + 3fe889b2724f312ba0dec7c01d85e9257e38818e https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index f0cb451ce..37f03bfc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.23509.2 + 9.0.0-beta.23509.3 diff --git a/global.json b/global.json index e2b168228..9c938c55b 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23509.2", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23509.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23509.3", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23509.3" } } From 64788194c2e6229c9ff5d55477de17da2cb2ef63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Tue, 10 Oct 2023 10:03:48 +0200 Subject: [PATCH 051/109] Use .NET 8 version of Microsoft.NET.Sdk.WebAssembly.Pack when targeting .NET 6/7 --- src/redist/targets/GenerateBundledVersions.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 80082d771..63437160a 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -106,7 +106,8 @@ <_NET70RuntimePackVersion>7.0.$(VersionFeature70) <_NET70TargetingPackVersion>7.0.$(VersionFeature70) - <_NET70WebAssemblyPackVersion>7.0.$(VersionFeature70) + + <_NET70WebAssemblyPackVersion>8.0.0-preview.7.23375.9 <_WindowsDesktop70RuntimePackVersion>7.0.$(VersionFeature70) <_WindowsDesktop70TargetingPackVersion>7.0.$(VersionFeature70) <_AspNet70RuntimePackVersion>7.0.$(VersionFeature70) From 65ad5bbb2a1ff94eee589c71abe582d730463f41 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Oct 2023 12:19:36 +0000 Subject: [PATCH 052/109] Update dependencies from https://github.com/dotnet/arcade build 20231010.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/post-build/check-channel-consistency.ps1 | 2 +- global.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44e962c5a..f33241927 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,18 +201,18 @@ - + https://github.com/dotnet/arcade - 3fe889b2724f312ba0dec7c01d85e9257e38818e + 3e1ba969512d5dc45f0885bab7338fe7f14d9689 - + https://github.com/dotnet/arcade - 3fe889b2724f312ba0dec7c01d85e9257e38818e + 3e1ba969512d5dc45f0885bab7338fe7f14d9689 - + https://github.com/dotnet/arcade - 3fe889b2724f312ba0dec7c01d85e9257e38818e + 3e1ba969512d5dc45f0885bab7338fe7f14d9689 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 37f03bfc4..79f54ce90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.23509.3 + 9.0.0-beta.23510.1 diff --git a/eng/common/post-build/check-channel-consistency.ps1 b/eng/common/post-build/check-channel-consistency.ps1 index 63f3464c9..1728f035a 100644 --- a/eng/common/post-build/check-channel-consistency.ps1 +++ b/eng/common/post-build/check-channel-consistency.ps1 @@ -7,7 +7,7 @@ try { . $PSScriptRoot\post-build-utils.ps1 if ($PromoteToChannels -eq "") { - Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info." + Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info." ExitWithExitCode 0 } diff --git a/global.json b/global.json index 9c938c55b..a21bf4bb3 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23509.3", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23509.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23510.1", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23510.1" } } From 313d29d69392a176661d77fdf55dc9f7033b695a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Oct 2023 12:50:22 +0000 Subject: [PATCH 053/109] Update dependencies from https://github.com/dotnet/sdk build 20231010.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23510.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e30701ba..52ab3aca1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/runtime - 218384f2c97288692ba9aac7e11b00961d7d7a98 + e555a0e16635c6ff2d88366f19d0781ac1fef0ee - + https://github.com/dotnet/runtime - 218384f2c97288692ba9aac7e11b00961d7d7a98 + e555a0e16635c6ff2d88366f19d0781ac1fef0ee - + https://github.com/dotnet/runtime - 218384f2c97288692ba9aac7e11b00961d7d7a98 + e555a0e16635c6ff2d88366f19d0781ac1fef0ee - + https://github.com/dotnet/runtime - 218384f2c97288692ba9aac7e11b00961d7d7a98 + e555a0e16635c6ff2d88366f19d0781ac1fef0ee - + https://github.com/dotnet/runtime - 218384f2c97288692ba9aac7e11b00961d7d7a98 + e555a0e16635c6ff2d88366f19d0781ac1fef0ee @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 218384f2c97288692ba9aac7e11b00961d7d7a98 + e555a0e16635c6ff2d88366f19d0781ac1fef0ee https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 040213756b5410297bba7d4f38ddbd6869821c8f + 04e64f5177b6b2f86dbbc1f91e7dd27777e04470 - + https://github.com/dotnet/sdk - 040213756b5410297bba7d4f38ddbd6869821c8f + 04e64f5177b6b2f86dbbc1f91e7dd27777e04470 - + https://github.com/dotnet/sdk - 040213756b5410297bba7d4f38ddbd6869821c8f + 04e64f5177b6b2f86dbbc1f91e7dd27777e04470 - + https://github.com/dotnet/sdk - 040213756b5410297bba7d4f38ddbd6869821c8f + 04e64f5177b6b2f86dbbc1f91e7dd27777e04470 https://github.com/dotnet/test-templates @@ -142,9 +142,9 @@ 00c72706ecc6d95e1e5c7c5a9d27990ebe16c9b8 - + https://github.com/dotnet/runtime - 218384f2c97288692ba9aac7e11b00961d7d7a98 + e555a0e16635c6ff2d88366f19d0781ac1fef0ee https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 4df52943f..783183713 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23509.10 - 9.0.100-alpha.1.23509.10 - 9.0.100-alpha.1.23509.10 + 9.0.100-alpha.1.23510.1 + 9.0.100-alpha.1.23510.1 + 9.0.100-alpha.1.23510.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -97,15 +97,15 @@ - 9.0.0-alpha.1.23509.2 + 9.0.0-alpha.1.23509.15 - 9.0.0-alpha.1.23509.2 - 9.0.0-alpha.1.23509.2 - 9.0.0-alpha.1.23509.2 - 9.0.0-alpha.1.23509.2 - 9.0.0-alpha.1.23509.2 + 9.0.0-alpha.1.23509.15 + 9.0.0-alpha.1.23509.15 + 9.0.0-alpha.1.23509.15 + 9.0.0-alpha.1.23509.15 + 9.0.0-alpha.1.23509.15 8.0.0-rc.1.23414.4 2.1.0 From 6fb079ace22b8bbe3b3482778bfd992b8674cc88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Oct 2023 13:37:49 +0000 Subject: [PATCH 054/109] Update dependencies from https://github.com/dotnet/sdk build 20231010.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23510.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.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 52ab3aca1..b41847e69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 04e64f5177b6b2f86dbbc1f91e7dd27777e04470 + f3143488131043ba6788f72044b7b28bbcc462dd - + https://github.com/dotnet/sdk - 04e64f5177b6b2f86dbbc1f91e7dd27777e04470 + f3143488131043ba6788f72044b7b28bbcc462dd - + https://github.com/dotnet/sdk - 04e64f5177b6b2f86dbbc1f91e7dd27777e04470 + f3143488131043ba6788f72044b7b28bbcc462dd - + https://github.com/dotnet/sdk - 04e64f5177b6b2f86dbbc1f91e7dd27777e04470 + f3143488131043ba6788f72044b7b28bbcc462dd https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 783183713..864bb2bdb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23510.1 - 9.0.100-alpha.1.23510.1 - 9.0.100-alpha.1.23510.1 + 9.0.100-alpha.1.23510.2 + 9.0.100-alpha.1.23510.2 + 9.0.100-alpha.1.23510.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7e9126d4806aa241f37898b0555ed1da2826f08a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Oct 2023 14:57:30 +0000 Subject: [PATCH 055/109] Update dependencies from https://github.com/dotnet/sdk build 20231010.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23510.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.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 b41847e69..6a258e4f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - f3143488131043ba6788f72044b7b28bbcc462dd + 154369028d08e97f46f6aa3bd6b94ccf2cf0167c - + https://github.com/dotnet/sdk - f3143488131043ba6788f72044b7b28bbcc462dd + 154369028d08e97f46f6aa3bd6b94ccf2cf0167c - + https://github.com/dotnet/sdk - f3143488131043ba6788f72044b7b28bbcc462dd + 154369028d08e97f46f6aa3bd6b94ccf2cf0167c - + https://github.com/dotnet/sdk - f3143488131043ba6788f72044b7b28bbcc462dd + 154369028d08e97f46f6aa3bd6b94ccf2cf0167c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 864bb2bdb..f10e7b8b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23510.2 - 9.0.100-alpha.1.23510.2 - 9.0.100-alpha.1.23510.2 + 9.0.100-alpha.1.23510.3 + 9.0.100-alpha.1.23510.3 + 9.0.100-alpha.1.23510.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cbbfdca2dc7ab9a7f4ab913ab233facbd56ca0b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Oct 2023 17:36:33 +0000 Subject: [PATCH 056/109] Update dependencies from https://github.com/dotnet/sdk build 20231010.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23510.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a258e4f0..9df6280c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/runtime - e555a0e16635c6ff2d88366f19d0781ac1fef0ee + 613e4fecde90a05d1df0cda69392434514ac18f5 - + https://github.com/dotnet/runtime - e555a0e16635c6ff2d88366f19d0781ac1fef0ee + 613e4fecde90a05d1df0cda69392434514ac18f5 - + https://github.com/dotnet/runtime - e555a0e16635c6ff2d88366f19d0781ac1fef0ee + 613e4fecde90a05d1df0cda69392434514ac18f5 - + https://github.com/dotnet/runtime - e555a0e16635c6ff2d88366f19d0781ac1fef0ee + 613e4fecde90a05d1df0cda69392434514ac18f5 - + https://github.com/dotnet/runtime - e555a0e16635c6ff2d88366f19d0781ac1fef0ee + 613e4fecde90a05d1df0cda69392434514ac18f5 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e555a0e16635c6ff2d88366f19d0781ac1fef0ee + 613e4fecde90a05d1df0cda69392434514ac18f5 https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 154369028d08e97f46f6aa3bd6b94ccf2cf0167c + 3772bd31568b188947422f0b0013940aed4a8c6b - + https://github.com/dotnet/sdk - 154369028d08e97f46f6aa3bd6b94ccf2cf0167c + 3772bd31568b188947422f0b0013940aed4a8c6b - + https://github.com/dotnet/sdk - 154369028d08e97f46f6aa3bd6b94ccf2cf0167c + 3772bd31568b188947422f0b0013940aed4a8c6b - + https://github.com/dotnet/sdk - 154369028d08e97f46f6aa3bd6b94ccf2cf0167c + 3772bd31568b188947422f0b0013940aed4a8c6b https://github.com/dotnet/test-templates @@ -142,9 +142,9 @@ 00c72706ecc6d95e1e5c7c5a9d27990ebe16c9b8 - + https://github.com/dotnet/runtime - e555a0e16635c6ff2d88366f19d0781ac1fef0ee + 613e4fecde90a05d1df0cda69392434514ac18f5 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index f10e7b8b8..32a8ba890 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23510.3 - 9.0.100-alpha.1.23510.3 - 9.0.100-alpha.1.23510.3 + 9.0.100-alpha.1.23510.4 + 9.0.100-alpha.1.23510.4 + 9.0.100-alpha.1.23510.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -97,15 +97,15 @@ - 9.0.0-alpha.1.23509.15 + 9.0.0-alpha.1.23510.2 - 9.0.0-alpha.1.23509.15 - 9.0.0-alpha.1.23509.15 - 9.0.0-alpha.1.23509.15 - 9.0.0-alpha.1.23509.15 - 9.0.0-alpha.1.23509.15 + 9.0.0-alpha.1.23510.2 + 9.0.0-alpha.1.23510.2 + 9.0.0-alpha.1.23510.2 + 9.0.0-alpha.1.23510.2 + 9.0.0-alpha.1.23510.2 8.0.0-rc.1.23414.4 2.1.0 From 59ba8ee2f581edd8dad6c6e35a791c321f60a21c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Oct 2023 18:13:18 +0000 Subject: [PATCH 057/109] Update dependencies from https://github.com/dotnet/arcade build 20231010.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f33241927..9d3223c26 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,18 +201,18 @@ - + https://github.com/dotnet/arcade - 3e1ba969512d5dc45f0885bab7338fe7f14d9689 + 79fe26cb443b349dced1e03c904783e040115ce9 - + https://github.com/dotnet/arcade - 3e1ba969512d5dc45f0885bab7338fe7f14d9689 + 79fe26cb443b349dced1e03c904783e040115ce9 - + https://github.com/dotnet/arcade - 3e1ba969512d5dc45f0885bab7338fe7f14d9689 + 79fe26cb443b349dced1e03c904783e040115ce9 https://github.com/dotnet/arcade-services @@ -231,9 +231,9 @@ 26ce96327dd346534926c4551f8b8d62a6fc724f - + https://github.com/dotnet/xliff-tasks - 0f36b29fb7374379609c3ee6a0b70caf457d8a0e + 9ea7eccc5d264af684633c1d757a6a5547a404e6 diff --git a/eng/Versions.props b/eng/Versions.props index 79f54ce90..011c1b562 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.23510.1 + 9.0.0-beta.23510.2 diff --git a/global.json b/global.json index a21bf4bb3..aa8c8d846 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23510.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23510.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23510.2", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23510.2" } } From 40b06d3e40ab6d862f773c9426e306beb0709cdc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Oct 2023 19:50:28 +0000 Subject: [PATCH 058/109] Update dependencies from https://github.com/dotnet/sdk build 20231010.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23510.10 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9df6280c6..4fd654c62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/runtime - 613e4fecde90a05d1df0cda69392434514ac18f5 + e0416331ce30ec4a66e2098fd3c52574183e413e - + https://github.com/dotnet/runtime - 613e4fecde90a05d1df0cda69392434514ac18f5 + e0416331ce30ec4a66e2098fd3c52574183e413e - + https://github.com/dotnet/runtime - 613e4fecde90a05d1df0cda69392434514ac18f5 + e0416331ce30ec4a66e2098fd3c52574183e413e - + https://github.com/dotnet/runtime - 613e4fecde90a05d1df0cda69392434514ac18f5 + e0416331ce30ec4a66e2098fd3c52574183e413e - + https://github.com/dotnet/runtime - 613e4fecde90a05d1df0cda69392434514ac18f5 + e0416331ce30ec4a66e2098fd3c52574183e413e @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 613e4fecde90a05d1df0cda69392434514ac18f5 + e0416331ce30ec4a66e2098fd3c52574183e413e https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 3772bd31568b188947422f0b0013940aed4a8c6b + b4438f81cc74b94823b71c6e84e611ccadc95981 - + https://github.com/dotnet/sdk - 3772bd31568b188947422f0b0013940aed4a8c6b + b4438f81cc74b94823b71c6e84e611ccadc95981 - + https://github.com/dotnet/sdk - 3772bd31568b188947422f0b0013940aed4a8c6b + b4438f81cc74b94823b71c6e84e611ccadc95981 - + https://github.com/dotnet/sdk - 3772bd31568b188947422f0b0013940aed4a8c6b + b4438f81cc74b94823b71c6e84e611ccadc95981 https://github.com/dotnet/test-templates @@ -142,9 +142,9 @@ 00c72706ecc6d95e1e5c7c5a9d27990ebe16c9b8 - + https://github.com/dotnet/runtime - 613e4fecde90a05d1df0cda69392434514ac18f5 + e0416331ce30ec4a66e2098fd3c52574183e413e https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 32a8ba890..dc237d58c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23510.4 - 9.0.100-alpha.1.23510.4 - 9.0.100-alpha.1.23510.4 + 9.0.100-alpha.1.23510.10 + 9.0.100-alpha.1.23510.10 + 9.0.100-alpha.1.23510.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -97,15 +97,15 @@ - 9.0.0-alpha.1.23510.2 + 9.0.0-alpha.1.23510.4 - 9.0.0-alpha.1.23510.2 - 9.0.0-alpha.1.23510.2 - 9.0.0-alpha.1.23510.2 - 9.0.0-alpha.1.23510.2 - 9.0.0-alpha.1.23510.2 + 9.0.0-alpha.1.23510.4 + 9.0.0-alpha.1.23510.4 + 9.0.0-alpha.1.23510.4 + 9.0.0-alpha.1.23510.4 + 9.0.0-alpha.1.23510.4 8.0.0-rc.1.23414.4 2.1.0 From 714f1b636266083d87070a6c3e45d14c5f41959a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Oct 2023 20:56:24 +0000 Subject: [PATCH 059/109] Update dependencies from https://github.com/dotnet/sdk build 20231010.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23510.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.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 4fd654c62..986ca79f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - b4438f81cc74b94823b71c6e84e611ccadc95981 + 85895805937c66ffe3e988a908d912f4aceee0ca - + https://github.com/dotnet/sdk - b4438f81cc74b94823b71c6e84e611ccadc95981 + 85895805937c66ffe3e988a908d912f4aceee0ca - + https://github.com/dotnet/sdk - b4438f81cc74b94823b71c6e84e611ccadc95981 + 85895805937c66ffe3e988a908d912f4aceee0ca - + https://github.com/dotnet/sdk - b4438f81cc74b94823b71c6e84e611ccadc95981 + 85895805937c66ffe3e988a908d912f4aceee0ca https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index dc237d58c..6344e54d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23510.10 - 9.0.100-alpha.1.23510.10 - 9.0.100-alpha.1.23510.10 + 9.0.100-alpha.1.23510.12 + 9.0.100-alpha.1.23510.12 + 9.0.100-alpha.1.23510.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6cb774e568487b5ab5ab648c153a6e3f66c8e287 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Oct 2023 21:44:52 +0000 Subject: [PATCH 060/109] Update dependencies from https://github.com/dotnet/sdk build 20231010.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23510.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.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 986ca79f7..86e40b0f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 85895805937c66ffe3e988a908d912f4aceee0ca + 7d9a711cbcf17d8afebf18b738e797cf35a19e45 - + https://github.com/dotnet/sdk - 85895805937c66ffe3e988a908d912f4aceee0ca + 7d9a711cbcf17d8afebf18b738e797cf35a19e45 - + https://github.com/dotnet/sdk - 85895805937c66ffe3e988a908d912f4aceee0ca + 7d9a711cbcf17d8afebf18b738e797cf35a19e45 - + https://github.com/dotnet/sdk - 85895805937c66ffe3e988a908d912f4aceee0ca + 7d9a711cbcf17d8afebf18b738e797cf35a19e45 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 6344e54d5..6a2e22446 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23510.12 - 9.0.100-alpha.1.23510.12 - 9.0.100-alpha.1.23510.12 + 9.0.100-alpha.1.23510.14 + 9.0.100-alpha.1.23510.14 + 9.0.100-alpha.1.23510.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 98a2962781d4d642568b4da91a16cadea1cc5df8 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 10 Oct 2023 17:09:01 -0700 Subject: [PATCH 061/109] Switch to use the existing 80 property for the web assembly sdk pack --- src/redist/targets/GenerateBundledVersions.targets | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 63437160a..7956cea8e 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -106,8 +106,6 @@ <_NET70RuntimePackVersion>7.0.$(VersionFeature70) <_NET70TargetingPackVersion>7.0.$(VersionFeature70) - - <_NET70WebAssemblyPackVersion>8.0.0-preview.7.23375.9 <_WindowsDesktop70RuntimePackVersion>7.0.$(VersionFeature70) <_WindowsDesktop70TargetingPackVersion>7.0.$(VersionFeature70) <_AspNet70RuntimePackVersion>7.0.$(VersionFeature70) @@ -736,7 +734,7 @@ Copyright (c) .NET Foundation. All rights reserved. + WebAssemblySdkPackVersion="$(_NET80WebAssemblyPackVersion)" /> + WebAssemblySdkPackVersion="$(_NET80WebAssemblyPackVersion)" /> Date: Wed, 11 Oct 2023 01:14:59 +0000 Subject: [PATCH 062/109] Update dependencies from https://github.com/dotnet/sdk build 20231010.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23510.17 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.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 86e40b0f9..e63f9d3c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 7d9a711cbcf17d8afebf18b738e797cf35a19e45 + 95ca5f7646da4fd852e4ab58fe85607267cea721 - + https://github.com/dotnet/sdk - 7d9a711cbcf17d8afebf18b738e797cf35a19e45 + 95ca5f7646da4fd852e4ab58fe85607267cea721 - + https://github.com/dotnet/sdk - 7d9a711cbcf17d8afebf18b738e797cf35a19e45 + 95ca5f7646da4fd852e4ab58fe85607267cea721 - + https://github.com/dotnet/sdk - 7d9a711cbcf17d8afebf18b738e797cf35a19e45 + 95ca5f7646da4fd852e4ab58fe85607267cea721 https://github.com/dotnet/test-templates @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 3a8376ca92de4c85dd92b05fba8a1c0a49b14cb9 - + https://github.com/dotnet/fsharp - 39ef9ca10f63a99de12f9b348a877d32c6446857 + 736b7454a057e390bf46a05c0f2d8b5760fd5ce9 - + https://github.com/dotnet/fsharp - 39ef9ca10f63a99de12f9b348a877d32c6446857 + 736b7454a057e390bf46a05c0f2d8b5760fd5ce9 diff --git a/eng/Versions.props b/eng/Versions.props index 6a2e22446..0ce1980ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23510.14 - 9.0.100-alpha.1.23510.14 - 9.0.100-alpha.1.23510.14 + 9.0.100-alpha.1.23510.17 + 9.0.100-alpha.1.23510.17 + 9.0.100-alpha.1.23510.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 55ad0fe623585a817df738ecbd092878ca56c962 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Oct 2023 03:06:57 +0000 Subject: [PATCH 063/109] Update dependencies from https://github.com/dotnet/sdk build 20231010.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23510.20 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e63f9d3c6..34ccf14c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/runtime - e0416331ce30ec4a66e2098fd3c52574183e413e + c9b5dd4850a824cd927eb41e6084f07669a979e9 - + https://github.com/dotnet/runtime - e0416331ce30ec4a66e2098fd3c52574183e413e + c9b5dd4850a824cd927eb41e6084f07669a979e9 - + https://github.com/dotnet/runtime - e0416331ce30ec4a66e2098fd3c52574183e413e + c9b5dd4850a824cd927eb41e6084f07669a979e9 - + https://github.com/dotnet/runtime - e0416331ce30ec4a66e2098fd3c52574183e413e + c9b5dd4850a824cd927eb41e6084f07669a979e9 - + https://github.com/dotnet/runtime - e0416331ce30ec4a66e2098fd3c52574183e413e + c9b5dd4850a824cd927eb41e6084f07669a979e9 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e0416331ce30ec4a66e2098fd3c52574183e413e + c9b5dd4850a824cd927eb41e6084f07669a979e9 https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 95ca5f7646da4fd852e4ab58fe85607267cea721 + 2a69428a6d7f914945e66534f330a514c235faff - + https://github.com/dotnet/sdk - 95ca5f7646da4fd852e4ab58fe85607267cea721 + 2a69428a6d7f914945e66534f330a514c235faff - + https://github.com/dotnet/sdk - 95ca5f7646da4fd852e4ab58fe85607267cea721 + 2a69428a6d7f914945e66534f330a514c235faff - + https://github.com/dotnet/sdk - 95ca5f7646da4fd852e4ab58fe85607267cea721 + 2a69428a6d7f914945e66534f330a514c235faff https://github.com/dotnet/test-templates @@ -142,9 +142,9 @@ 00c72706ecc6d95e1e5c7c5a9d27990ebe16c9b8 - + https://github.com/dotnet/runtime - e0416331ce30ec4a66e2098fd3c52574183e413e + c9b5dd4850a824cd927eb41e6084f07669a979e9 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 0ce1980ac..ba4ce86cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23510.17 - 9.0.100-alpha.1.23510.17 - 9.0.100-alpha.1.23510.17 + 9.0.100-alpha.1.23510.20 + 9.0.100-alpha.1.23510.20 + 9.0.100-alpha.1.23510.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -97,15 +97,15 @@ - 9.0.0-alpha.1.23510.4 + 9.0.0-alpha.1.23510.7 - 9.0.0-alpha.1.23510.4 - 9.0.0-alpha.1.23510.4 - 9.0.0-alpha.1.23510.4 - 9.0.0-alpha.1.23510.4 - 9.0.0-alpha.1.23510.4 + 9.0.0-alpha.1.23510.7 + 9.0.0-alpha.1.23510.7 + 9.0.0-alpha.1.23510.7 + 9.0.0-alpha.1.23510.7 + 9.0.0-alpha.1.23510.7 8.0.0-rc.1.23414.4 2.1.0 From 0aa52d8d4d20c04d6abd86baa3c35355bf503d6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Oct 2023 03:50:44 +0000 Subject: [PATCH 064/109] Update dependencies from https://github.com/dotnet/sdk build 20231010.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23510.21 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.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 34ccf14c2..c0d0a27e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 2a69428a6d7f914945e66534f330a514c235faff + dee649253b43f984a7e27f35e7c665912ec47839 - + https://github.com/dotnet/sdk - 2a69428a6d7f914945e66534f330a514c235faff + dee649253b43f984a7e27f35e7c665912ec47839 - + https://github.com/dotnet/sdk - 2a69428a6d7f914945e66534f330a514c235faff + dee649253b43f984a7e27f35e7c665912ec47839 - + https://github.com/dotnet/sdk - 2a69428a6d7f914945e66534f330a514c235faff + dee649253b43f984a7e27f35e7c665912ec47839 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ba4ce86cf..65132f84f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23510.20 - 9.0.100-alpha.1.23510.20 - 9.0.100-alpha.1.23510.20 + 9.0.100-alpha.1.23510.21 + 9.0.100-alpha.1.23510.21 + 9.0.100-alpha.1.23510.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 65c0d30965142411b93fa4a604654862bf4a48ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Oct 2023 04:34:20 +0000 Subject: [PATCH 065/109] Update dependencies from https://github.com/dotnet/sdk build 20231010.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23510.24 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.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 c0d0a27e4..2c70e3297 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - dee649253b43f984a7e27f35e7c665912ec47839 + 5c25b82e37d69d26ebe6c5bf6dd91eb95d6b6f29 - + https://github.com/dotnet/sdk - dee649253b43f984a7e27f35e7c665912ec47839 + 5c25b82e37d69d26ebe6c5bf6dd91eb95d6b6f29 - + https://github.com/dotnet/sdk - dee649253b43f984a7e27f35e7c665912ec47839 + 5c25b82e37d69d26ebe6c5bf6dd91eb95d6b6f29 - + https://github.com/dotnet/sdk - dee649253b43f984a7e27f35e7c665912ec47839 + 5c25b82e37d69d26ebe6c5bf6dd91eb95d6b6f29 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 65132f84f..1b94e7881 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23510.21 - 9.0.100-alpha.1.23510.21 - 9.0.100-alpha.1.23510.21 + 9.0.100-alpha.1.23510.24 + 9.0.100-alpha.1.23510.24 + 9.0.100-alpha.1.23510.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aae6301e3c1f4c6419503b800bb073c751b3e421 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Oct 2023 07:45:10 +0000 Subject: [PATCH 066/109] Update dependencies from https://github.com/dotnet/arcade build 20231010.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d3223c26..563b4e855 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,18 +201,18 @@ - + https://github.com/dotnet/arcade - 79fe26cb443b349dced1e03c904783e040115ce9 + 0e89c8d7ddbb54510d9d0a757fda5126021b79f0 - + https://github.com/dotnet/arcade - 79fe26cb443b349dced1e03c904783e040115ce9 + 0e89c8d7ddbb54510d9d0a757fda5126021b79f0 - + https://github.com/dotnet/arcade - 79fe26cb443b349dced1e03c904783e040115ce9 + 0e89c8d7ddbb54510d9d0a757fda5126021b79f0 https://github.com/dotnet/arcade-services @@ -231,9 +231,9 @@ 26ce96327dd346534926c4551f8b8d62a6fc724f - + https://github.com/dotnet/xliff-tasks - 9ea7eccc5d264af684633c1d757a6a5547a404e6 + 4f761bf529f4be49842b13d7efcef9af87f0a973 diff --git a/eng/Versions.props b/eng/Versions.props index 011c1b562..2de76494b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.23510.2 + 9.0.0-beta.23510.4 diff --git a/global.json b/global.json index aa8c8d846..60eedfe37 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23510.2", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23510.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23510.4", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23510.4" } } From d996d5b8a709ae53cd1c9a567f079f72ba53c3eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Oct 2023 07:58:10 +0000 Subject: [PATCH 067/109] Update dependencies from https://github.com/dotnet/sdk build 20231011.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23511.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c70e3297..b08894293 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/runtime - c9b5dd4850a824cd927eb41e6084f07669a979e9 + e85b6787c80073a017675c32018a2e3e63cf8cbb - + https://github.com/dotnet/runtime - c9b5dd4850a824cd927eb41e6084f07669a979e9 + e85b6787c80073a017675c32018a2e3e63cf8cbb - + https://github.com/dotnet/runtime - c9b5dd4850a824cd927eb41e6084f07669a979e9 + e85b6787c80073a017675c32018a2e3e63cf8cbb - + https://github.com/dotnet/runtime - c9b5dd4850a824cd927eb41e6084f07669a979e9 + e85b6787c80073a017675c32018a2e3e63cf8cbb - + https://github.com/dotnet/runtime - c9b5dd4850a824cd927eb41e6084f07669a979e9 + e85b6787c80073a017675c32018a2e3e63cf8cbb @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - c9b5dd4850a824cd927eb41e6084f07669a979e9 + e85b6787c80073a017675c32018a2e3e63cf8cbb https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 5c25b82e37d69d26ebe6c5bf6dd91eb95d6b6f29 + 46d1abf80d802917b02575ca8f7f45bbb6fdab18 - + https://github.com/dotnet/sdk - 5c25b82e37d69d26ebe6c5bf6dd91eb95d6b6f29 + 46d1abf80d802917b02575ca8f7f45bbb6fdab18 - + https://github.com/dotnet/sdk - 5c25b82e37d69d26ebe6c5bf6dd91eb95d6b6f29 + 46d1abf80d802917b02575ca8f7f45bbb6fdab18 - + https://github.com/dotnet/sdk - 5c25b82e37d69d26ebe6c5bf6dd91eb95d6b6f29 + 46d1abf80d802917b02575ca8f7f45bbb6fdab18 https://github.com/dotnet/test-templates @@ -142,9 +142,9 @@ 00c72706ecc6d95e1e5c7c5a9d27990ebe16c9b8 - + https://github.com/dotnet/runtime - c9b5dd4850a824cd927eb41e6084f07669a979e9 + e85b6787c80073a017675c32018a2e3e63cf8cbb https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 1b94e7881..e8714e3fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23510.24 - 9.0.100-alpha.1.23510.24 - 9.0.100-alpha.1.23510.24 + 9.0.100-alpha.1.23511.1 + 9.0.100-alpha.1.23511.1 + 9.0.100-alpha.1.23511.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -97,15 +97,15 @@ - 9.0.0-alpha.1.23510.7 + 9.0.0-alpha.1.23510.11 - 9.0.0-alpha.1.23510.7 - 9.0.0-alpha.1.23510.7 - 9.0.0-alpha.1.23510.7 - 9.0.0-alpha.1.23510.7 - 9.0.0-alpha.1.23510.7 + 9.0.0-alpha.1.23510.11 + 9.0.0-alpha.1.23510.11 + 9.0.0-alpha.1.23510.11 + 9.0.0-alpha.1.23510.11 + 9.0.0-alpha.1.23510.11 8.0.0-rc.1.23414.4 2.1.0 From 8961cfd3f6d717ca242345703d7b59f294e7143b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Oct 2023 10:12:41 +0000 Subject: [PATCH 068/109] Update dependencies from https://github.com/dotnet/sdk build 20231011.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23511.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b08894293..76e53cab2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/runtime - e85b6787c80073a017675c32018a2e3e63cf8cbb + 5f4ee519c7ce0bfe1e914ee7a617e17b5c509cf5 - + https://github.com/dotnet/runtime - e85b6787c80073a017675c32018a2e3e63cf8cbb + 5f4ee519c7ce0bfe1e914ee7a617e17b5c509cf5 - + https://github.com/dotnet/runtime - e85b6787c80073a017675c32018a2e3e63cf8cbb + 5f4ee519c7ce0bfe1e914ee7a617e17b5c509cf5 - + https://github.com/dotnet/runtime - e85b6787c80073a017675c32018a2e3e63cf8cbb + 5f4ee519c7ce0bfe1e914ee7a617e17b5c509cf5 - + https://github.com/dotnet/runtime - e85b6787c80073a017675c32018a2e3e63cf8cbb + 5f4ee519c7ce0bfe1e914ee7a617e17b5c509cf5 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e85b6787c80073a017675c32018a2e3e63cf8cbb + 5f4ee519c7ce0bfe1e914ee7a617e17b5c509cf5 https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 46d1abf80d802917b02575ca8f7f45bbb6fdab18 + 89748af13dd41aa52999d32cff5fa7c9aaa58d32 - + https://github.com/dotnet/sdk - 46d1abf80d802917b02575ca8f7f45bbb6fdab18 + 89748af13dd41aa52999d32cff5fa7c9aaa58d32 - + https://github.com/dotnet/sdk - 46d1abf80d802917b02575ca8f7f45bbb6fdab18 + 89748af13dd41aa52999d32cff5fa7c9aaa58d32 - + https://github.com/dotnet/sdk - 46d1abf80d802917b02575ca8f7f45bbb6fdab18 + 89748af13dd41aa52999d32cff5fa7c9aaa58d32 https://github.com/dotnet/test-templates @@ -142,9 +142,9 @@ 00c72706ecc6d95e1e5c7c5a9d27990ebe16c9b8 - + https://github.com/dotnet/runtime - e85b6787c80073a017675c32018a2e3e63cf8cbb + 5f4ee519c7ce0bfe1e914ee7a617e17b5c509cf5 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index e8714e3fe..8d530fd4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23511.1 - 9.0.100-alpha.1.23511.1 - 9.0.100-alpha.1.23511.1 + 9.0.100-alpha.1.23511.2 + 9.0.100-alpha.1.23511.2 + 9.0.100-alpha.1.23511.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -97,15 +97,15 @@ - 9.0.0-alpha.1.23510.11 + 9.0.0-alpha.1.23510.12 - 9.0.0-alpha.1.23510.11 - 9.0.0-alpha.1.23510.11 - 9.0.0-alpha.1.23510.11 - 9.0.0-alpha.1.23510.11 - 9.0.0-alpha.1.23510.11 + 9.0.0-alpha.1.23510.12 + 9.0.0-alpha.1.23510.12 + 9.0.0-alpha.1.23510.12 + 9.0.0-alpha.1.23510.12 + 9.0.0-alpha.1.23510.12 8.0.0-rc.1.23414.4 2.1.0 From 774b85a5f0cde46b9aed7038c111e06b489b7ec7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Oct 2023 12:16:18 +0000 Subject: [PATCH 069/109] Update dependencies from https://github.com/dotnet/arcade build 20231010.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk From 56854583de90c162cb6c72d468fcffe61eac2d16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Oct 2023 16:55:49 +0000 Subject: [PATCH 070/109] Update dependencies from https://github.com/dotnet/sdk build 20231011.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23511.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (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 76e53cab2..b56842390 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 89748af13dd41aa52999d32cff5fa7c9aaa58d32 + c77665afe86cd977dc95279c7a4b46dc3d4b5de9 - + https://github.com/dotnet/sdk - 89748af13dd41aa52999d32cff5fa7c9aaa58d32 + c77665afe86cd977dc95279c7a4b46dc3d4b5de9 - + https://github.com/dotnet/sdk - 89748af13dd41aa52999d32cff5fa7c9aaa58d32 + c77665afe86cd977dc95279c7a4b46dc3d4b5de9 - + https://github.com/dotnet/sdk - 89748af13dd41aa52999d32cff5fa7c9aaa58d32 + c77665afe86cd977dc95279c7a4b46dc3d4b5de9 https://github.com/dotnet/test-templates @@ -137,9 +137,9 @@ 736b7454a057e390bf46a05c0f2d8b5760fd5ce9 - + https://github.com/microsoft/vstest - 00c72706ecc6d95e1e5c7c5a9d27990ebe16c9b8 + 89a55b6ca9270e3e12e3e158104518c225f5ed46 @@ -151,9 +151,9 @@ 0caa880a161057559d1dcaad890e4053f520136e - + https://github.com/dotnet/msbuild - 01bf0f2cf0a19b2c064947fba40eae80c1125fb3 + a9341111228592c25c43ecf6858e7b39e525b5a1 diff --git a/eng/Versions.props b/eng/Versions.props index 8d530fd4a..40e6df347 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23511.2 - 9.0.100-alpha.1.23511.2 - 9.0.100-alpha.1.23511.2 + 9.0.100-alpha.1.23511.3 + 9.0.100-alpha.1.23511.3 + 9.0.100-alpha.1.23511.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -238,7 +238,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23506-01 + 17.9.0-preview-23509-01 8.0.0-alpha.1.22557.12 8.0.0-preview.23424.2 From 15b21b3e2d332f0f247f940861a2d91ef73b9859 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Wed, 11 Oct 2023 12:02:22 -0500 Subject: [PATCH 071/109] Add parens to the pattern to see if it fixes things --- test/EndToEnd/ProjectBuildTests.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 4b1f5db46..59054c399 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -213,16 +213,16 @@ namespace EndToEnd.Tests string expectedOutput = @"[\-\s]+ -[\w \.]+webapp,razor\s+\[C#\][\w\ \/]+ -[\w \.]+classlib\s+\[C#\],F#,VB[\w\ \/]+ -[\w \.]+console\s+\[C#\],F#,VB[\w\ \/]+ +[\w \.\(\)]+webapp,razor\s+\[C#\][\w\ \/]+ +[\w \.\(\)]+classlib\s+\[C#\],F#,VB[\w\ \/]+ +[\w \.\(\)]+console\s+\[C#\],F#,VB[\w\ \/]+ "; if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { expectedOutput += -@"[\w \.]+winforms\s+\[C#\],VB[\w\ \/]+ -[\w \.]+\wpf\s+\[C#\],VB[\w\ \/]+ +@"[\w \.\(\)]+winforms\s+\[C#\],VB[\w\ \/]+ +[\w \.\(\)]+\wpf\s+\[C#\],VB[\w\ \/]+ "; } //list should end with new line From 81776093a0813245fa1ffc734f8fe0f42277bf41 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 11 Oct 2023 12:54:11 -0500 Subject: [PATCH 072/109] Update SDK version for source-build --- src/SourceBuild/content/global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index a29dc5cc6..e1487359b 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-rc.1.23410.12" + "dotnet": "9.0.100-alpha.1.23511.2" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From c4e51ed4632060a161622c0c4b8a9dfc3f1015b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Oct 2023 18:10:55 +0000 Subject: [PATCH 073/109] Update dependencies from https://github.com/dotnet/sdk build 20231011.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23511.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.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 b56842390..6a1c64c3a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - c77665afe86cd977dc95279c7a4b46dc3d4b5de9 + a3bf79f6ef49b04810412adf35ee62518afb9099 - + https://github.com/dotnet/sdk - c77665afe86cd977dc95279c7a4b46dc3d4b5de9 + a3bf79f6ef49b04810412adf35ee62518afb9099 - + https://github.com/dotnet/sdk - c77665afe86cd977dc95279c7a4b46dc3d4b5de9 + a3bf79f6ef49b04810412adf35ee62518afb9099 - + https://github.com/dotnet/sdk - c77665afe86cd977dc95279c7a4b46dc3d4b5de9 + a3bf79f6ef49b04810412adf35ee62518afb9099 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 40e6df347..db658b68e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23511.3 - 9.0.100-alpha.1.23511.3 - 9.0.100-alpha.1.23511.3 + 9.0.100-alpha.1.23511.4 + 9.0.100-alpha.1.23511.4 + 9.0.100-alpha.1.23511.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0a7d893b220c9060d4aaba04020e9fb2090ca2f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Oct 2023 18:59:35 +0000 Subject: [PATCH 074/109] Update dependencies from https://github.com/dotnet/sdk build 20231011.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23511.7 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.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 6a1c64c3a..5a562ea86 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - a3bf79f6ef49b04810412adf35ee62518afb9099 + 8695f3740e2a60fb6c31d5d7a65a900902760f73 - + https://github.com/dotnet/sdk - a3bf79f6ef49b04810412adf35ee62518afb9099 + 8695f3740e2a60fb6c31d5d7a65a900902760f73 - + https://github.com/dotnet/sdk - a3bf79f6ef49b04810412adf35ee62518afb9099 + 8695f3740e2a60fb6c31d5d7a65a900902760f73 - + https://github.com/dotnet/sdk - a3bf79f6ef49b04810412adf35ee62518afb9099 + 8695f3740e2a60fb6c31d5d7a65a900902760f73 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index db658b68e..edbc529c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23511.4 - 9.0.100-alpha.1.23511.4 - 9.0.100-alpha.1.23511.4 + 9.0.100-alpha.1.23511.7 + 9.0.100-alpha.1.23511.7 + 9.0.100-alpha.1.23511.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e060a37fd4c5dd49952854de106da228731bff61 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Oct 2023 22:12:42 +0000 Subject: [PATCH 075/109] Update dependencies from https://github.com/dotnet/sdk build 20231011.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23511.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.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 5a562ea86..e6b2648a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 8695f3740e2a60fb6c31d5d7a65a900902760f73 + 0e7baa54b17572b0b38a6a4b00ec3f9213843d15 - + https://github.com/dotnet/sdk - 8695f3740e2a60fb6c31d5d7a65a900902760f73 + 0e7baa54b17572b0b38a6a4b00ec3f9213843d15 - + https://github.com/dotnet/sdk - 8695f3740e2a60fb6c31d5d7a65a900902760f73 + 0e7baa54b17572b0b38a6a4b00ec3f9213843d15 - + https://github.com/dotnet/sdk - 8695f3740e2a60fb6c31d5d7a65a900902760f73 + 0e7baa54b17572b0b38a6a4b00ec3f9213843d15 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index edbc529c6..90daa8cc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23511.7 - 9.0.100-alpha.1.23511.7 - 9.0.100-alpha.1.23511.7 + 9.0.100-alpha.1.23511.9 + 9.0.100-alpha.1.23511.9 + 9.0.100-alpha.1.23511.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cf891c509f2aa4589e289b6427fa73e254fd9023 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 00:36:59 +0000 Subject: [PATCH 076/109] Update dependencies from https://github.com/dotnet/sdk build 20231011.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23511.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e6b2648a5..24e15157f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/runtime - 5f4ee519c7ce0bfe1e914ee7a617e17b5c509cf5 + 9aec1e3b0b9ddc02b81bd115399f8951288b261b - + https://github.com/dotnet/runtime - 5f4ee519c7ce0bfe1e914ee7a617e17b5c509cf5 + 9aec1e3b0b9ddc02b81bd115399f8951288b261b - + https://github.com/dotnet/runtime - 5f4ee519c7ce0bfe1e914ee7a617e17b5c509cf5 + 9aec1e3b0b9ddc02b81bd115399f8951288b261b - + https://github.com/dotnet/runtime - 5f4ee519c7ce0bfe1e914ee7a617e17b5c509cf5 + 9aec1e3b0b9ddc02b81bd115399f8951288b261b - + https://github.com/dotnet/runtime - 5f4ee519c7ce0bfe1e914ee7a617e17b5c509cf5 + 9aec1e3b0b9ddc02b81bd115399f8951288b261b @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5f4ee519c7ce0bfe1e914ee7a617e17b5c509cf5 + 9aec1e3b0b9ddc02b81bd115399f8951288b261b https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 0e7baa54b17572b0b38a6a4b00ec3f9213843d15 + 707fe79b71f9952d8ac9f5fb1414b0d4dff0605a - + https://github.com/dotnet/sdk - 0e7baa54b17572b0b38a6a4b00ec3f9213843d15 + 707fe79b71f9952d8ac9f5fb1414b0d4dff0605a - + https://github.com/dotnet/sdk - 0e7baa54b17572b0b38a6a4b00ec3f9213843d15 + 707fe79b71f9952d8ac9f5fb1414b0d4dff0605a - + https://github.com/dotnet/sdk - 0e7baa54b17572b0b38a6a4b00ec3f9213843d15 + 707fe79b71f9952d8ac9f5fb1414b0d4dff0605a https://github.com/dotnet/test-templates @@ -142,9 +142,9 @@ 89a55b6ca9270e3e12e3e158104518c225f5ed46 - + https://github.com/dotnet/runtime - 5f4ee519c7ce0bfe1e914ee7a617e17b5c509cf5 + 9aec1e3b0b9ddc02b81bd115399f8951288b261b https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 90daa8cc7..33a96cee9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23511.9 - 9.0.100-alpha.1.23511.9 - 9.0.100-alpha.1.23511.9 + 9.0.100-alpha.1.23511.11 + 9.0.100-alpha.1.23511.11 + 9.0.100-alpha.1.23511.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -97,15 +97,15 @@ - 9.0.0-alpha.1.23510.12 + 9.0.0-alpha.1.23511.6 - 9.0.0-alpha.1.23510.12 - 9.0.0-alpha.1.23510.12 - 9.0.0-alpha.1.23510.12 - 9.0.0-alpha.1.23510.12 - 9.0.0-alpha.1.23510.12 + 9.0.0-alpha.1.23511.6 + 9.0.0-alpha.1.23511.6 + 9.0.0-alpha.1.23511.6 + 9.0.0-alpha.1.23511.6 + 9.0.0-alpha.1.23511.6 8.0.0-rc.1.23414.4 2.1.0 From b38c3742274f0ba3e81c435121104299f11856b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 02:52:11 +0000 Subject: [PATCH 077/109] Update dependencies from https://github.com/dotnet/sdk build 20231011.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23511.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (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 24e15157f..7b891bd53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 707fe79b71f9952d8ac9f5fb1414b0d4dff0605a + 8dede3e526303b6bf549acbc3ba97fcb5f4e3b6b - + https://github.com/dotnet/sdk - 707fe79b71f9952d8ac9f5fb1414b0d4dff0605a + 8dede3e526303b6bf549acbc3ba97fcb5f4e3b6b - + https://github.com/dotnet/sdk - 707fe79b71f9952d8ac9f5fb1414b0d4dff0605a + 8dede3e526303b6bf549acbc3ba97fcb5f4e3b6b - + https://github.com/dotnet/sdk - 707fe79b71f9952d8ac9f5fb1414b0d4dff0605a + 8dede3e526303b6bf549acbc3ba97fcb5f4e3b6b https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 9aec1e3b0b9ddc02b81bd115399f8951288b261b - + https://github.com/dotnet/roslyn - 0caa880a161057559d1dcaad890e4053f520136e + f4f2b9ed75b438cac3fd5b32b785417213b10aab diff --git a/eng/Versions.props b/eng/Versions.props index 33a96cee9..93ce98a69 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,16 +84,16 @@ - 9.0.100-alpha.1.23511.11 - 9.0.100-alpha.1.23511.11 - 9.0.100-alpha.1.23511.11 + 9.0.100-alpha.1.23511.12 + 9.0.100-alpha.1.23511.12 + 9.0.100-alpha.1.23511.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-1.23506.7 + 4.9.0-1.23511.2 From 66603366b7e217fe96487921b6cfc353cd1380f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 03:50:13 +0000 Subject: [PATCH 078/109] Update dependencies from https://github.com/dotnet/sdk build 20231011.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23511.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b891bd53..5e1d3d517 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/runtime - 9aec1e3b0b9ddc02b81bd115399f8951288b261b + b62445b0b3cd6d9d70a4017ff2d39c58fb830d93 - + https://github.com/dotnet/runtime - 9aec1e3b0b9ddc02b81bd115399f8951288b261b + b62445b0b3cd6d9d70a4017ff2d39c58fb830d93 - + https://github.com/dotnet/runtime - 9aec1e3b0b9ddc02b81bd115399f8951288b261b + b62445b0b3cd6d9d70a4017ff2d39c58fb830d93 - + https://github.com/dotnet/runtime - 9aec1e3b0b9ddc02b81bd115399f8951288b261b + b62445b0b3cd6d9d70a4017ff2d39c58fb830d93 - + https://github.com/dotnet/runtime - 9aec1e3b0b9ddc02b81bd115399f8951288b261b + b62445b0b3cd6d9d70a4017ff2d39c58fb830d93 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 9aec1e3b0b9ddc02b81bd115399f8951288b261b + b62445b0b3cd6d9d70a4017ff2d39c58fb830d93 https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 8dede3e526303b6bf549acbc3ba97fcb5f4e3b6b + e68458908db40bea8679f94d22779d79fb26ad24 - + https://github.com/dotnet/sdk - 8dede3e526303b6bf549acbc3ba97fcb5f4e3b6b + e68458908db40bea8679f94d22779d79fb26ad24 - + https://github.com/dotnet/sdk - 8dede3e526303b6bf549acbc3ba97fcb5f4e3b6b + e68458908db40bea8679f94d22779d79fb26ad24 - + https://github.com/dotnet/sdk - 8dede3e526303b6bf549acbc3ba97fcb5f4e3b6b + e68458908db40bea8679f94d22779d79fb26ad24 https://github.com/dotnet/test-templates @@ -142,9 +142,9 @@ 89a55b6ca9270e3e12e3e158104518c225f5ed46 - + https://github.com/dotnet/runtime - 9aec1e3b0b9ddc02b81bd115399f8951288b261b + b62445b0b3cd6d9d70a4017ff2d39c58fb830d93 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 93ce98a69..eebedddfa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23511.12 - 9.0.100-alpha.1.23511.12 - 9.0.100-alpha.1.23511.12 + 9.0.100-alpha.1.23511.14 + 9.0.100-alpha.1.23511.14 + 9.0.100-alpha.1.23511.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -97,15 +97,15 @@ - 9.0.0-alpha.1.23511.6 + 9.0.0-alpha.1.23511.9 - 9.0.0-alpha.1.23511.6 - 9.0.0-alpha.1.23511.6 - 9.0.0-alpha.1.23511.6 - 9.0.0-alpha.1.23511.6 - 9.0.0-alpha.1.23511.6 + 9.0.0-alpha.1.23511.9 + 9.0.0-alpha.1.23511.9 + 9.0.0-alpha.1.23511.9 + 9.0.0-alpha.1.23511.9 + 9.0.0-alpha.1.23511.9 8.0.0-rc.1.23414.4 2.1.0 From b4ad2e4c96dc24900a0ad18a623c1c1b07073a23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 04:35:10 +0000 Subject: [PATCH 079/109] Update dependencies from https://github.com/dotnet/sdk build 20231011.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23511.17 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.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 5e1d3d517..581ce7099 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - e68458908db40bea8679f94d22779d79fb26ad24 + 9ffff8dee4cdbbf32e2e80c9c0873dce3b958277 - + https://github.com/dotnet/sdk - e68458908db40bea8679f94d22779d79fb26ad24 + 9ffff8dee4cdbbf32e2e80c9c0873dce3b958277 - + https://github.com/dotnet/sdk - e68458908db40bea8679f94d22779d79fb26ad24 + 9ffff8dee4cdbbf32e2e80c9c0873dce3b958277 - + https://github.com/dotnet/sdk - e68458908db40bea8679f94d22779d79fb26ad24 + 9ffff8dee4cdbbf32e2e80c9c0873dce3b958277 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index eebedddfa..10a37face 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23511.14 - 9.0.100-alpha.1.23511.14 - 9.0.100-alpha.1.23511.14 + 9.0.100-alpha.1.23511.17 + 9.0.100-alpha.1.23511.17 + 9.0.100-alpha.1.23511.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f8d1894eba644d675f152fd29be7474166d70c60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 07:38:12 +0000 Subject: [PATCH 080/109] Update dependencies from https://github.com/dotnet/sdk build 20231011.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23511.20 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.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 581ce7099..4079d8120 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - 9ffff8dee4cdbbf32e2e80c9c0873dce3b958277 + f38c29f937048c2f501c1c5e0bf4886db5e84b92 - + https://github.com/dotnet/sdk - 9ffff8dee4cdbbf32e2e80c9c0873dce3b958277 + f38c29f937048c2f501c1c5e0bf4886db5e84b92 - + https://github.com/dotnet/sdk - 9ffff8dee4cdbbf32e2e80c9c0873dce3b958277 + f38c29f937048c2f501c1c5e0bf4886db5e84b92 - + https://github.com/dotnet/sdk - 9ffff8dee4cdbbf32e2e80c9c0873dce3b958277 + f38c29f937048c2f501c1c5e0bf4886db5e84b92 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 10a37face..0521d4b31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23511.17 - 9.0.100-alpha.1.23511.17 - 9.0.100-alpha.1.23511.17 + 9.0.100-alpha.1.23511.20 + 9.0.100-alpha.1.23511.20 + 9.0.100-alpha.1.23511.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6d8c0320985308d319414e64364bad89052c570d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 08:13:20 +0000 Subject: [PATCH 081/109] Update dependencies from https://github.com/dotnet/sdk build 20231012.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23512.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4079d8120..6b8393a8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/runtime - b62445b0b3cd6d9d70a4017ff2d39c58fb830d93 + 5280006fb69e15a3a429ff34a9a0b2f3c2434000 - + https://github.com/dotnet/runtime - b62445b0b3cd6d9d70a4017ff2d39c58fb830d93 + 5280006fb69e15a3a429ff34a9a0b2f3c2434000 - + https://github.com/dotnet/runtime - b62445b0b3cd6d9d70a4017ff2d39c58fb830d93 + 5280006fb69e15a3a429ff34a9a0b2f3c2434000 - + https://github.com/dotnet/runtime - b62445b0b3cd6d9d70a4017ff2d39c58fb830d93 + 5280006fb69e15a3a429ff34a9a0b2f3c2434000 - + https://github.com/dotnet/runtime - b62445b0b3cd6d9d70a4017ff2d39c58fb830d93 + 5280006fb69e15a3a429ff34a9a0b2f3c2434000 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b62445b0b3cd6d9d70a4017ff2d39c58fb830d93 + 5280006fb69e15a3a429ff34a9a0b2f3c2434000 https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/sdk - f38c29f937048c2f501c1c5e0bf4886db5e84b92 + 4b128943b420ec8270905fdc671335d30779daea - + https://github.com/dotnet/sdk - f38c29f937048c2f501c1c5e0bf4886db5e84b92 + 4b128943b420ec8270905fdc671335d30779daea - + https://github.com/dotnet/sdk - f38c29f937048c2f501c1c5e0bf4886db5e84b92 + 4b128943b420ec8270905fdc671335d30779daea - + https://github.com/dotnet/sdk - f38c29f937048c2f501c1c5e0bf4886db5e84b92 + 4b128943b420ec8270905fdc671335d30779daea https://github.com/dotnet/test-templates @@ -142,13 +142,13 @@ 89a55b6ca9270e3e12e3e158104518c225f5ed46 - + https://github.com/dotnet/runtime - b62445b0b3cd6d9d70a4017ff2d39c58fb830d93 + 5280006fb69e15a3a429ff34a9a0b2f3c2434000 - + https://github.com/dotnet/roslyn - f4f2b9ed75b438cac3fd5b32b785417213b10aab + 63cbcad96a6ba0f8f7eed4d8af51b6f7894167d4 diff --git a/eng/Versions.props b/eng/Versions.props index 0521d4b31..7453cb57f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,28 +84,28 @@ - 9.0.100-alpha.1.23511.20 - 9.0.100-alpha.1.23511.20 - 9.0.100-alpha.1.23511.20 + 9.0.100-alpha.1.23512.3 + 9.0.100-alpha.1.23512.3 + 9.0.100-alpha.1.23512.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-1.23511.2 + 4.9.0-1.23511.7 - 9.0.0-alpha.1.23511.9 + 9.0.0-alpha.1.23511.17 - 9.0.0-alpha.1.23511.9 - 9.0.0-alpha.1.23511.9 - 9.0.0-alpha.1.23511.9 - 9.0.0-alpha.1.23511.9 - 9.0.0-alpha.1.23511.9 + 9.0.0-alpha.1.23511.17 + 9.0.0-alpha.1.23511.17 + 9.0.0-alpha.1.23511.17 + 9.0.0-alpha.1.23511.17 + 9.0.0-alpha.1.23511.17 8.0.0-rc.1.23414.4 2.1.0 From 9ef0c7c06183935219488f3e801fc4d3455b273d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 08:58:44 +0000 Subject: [PATCH 082/109] Update dependencies from https://github.com/dotnet/sdk build 20231012.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23512.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b8393a8e..27dc0b31c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,51 +52,51 @@ https://github.com/dotnet/runtime 5280006fb69e15a3a429ff34a9a0b2f3c2434000 - + https://github.com/dotnet/aspnetcore - fa54329186df2e11b40bdfec4ae08f16fdbe9d99 + 34ef6922fb525dcecc8a3f9b7750414de93af438 - + https://github.com/dotnet/aspnetcore - fa54329186df2e11b40bdfec4ae08f16fdbe9d99 + 34ef6922fb525dcecc8a3f9b7750414de93af438 - + https://github.com/dotnet/aspnetcore - fa54329186df2e11b40bdfec4ae08f16fdbe9d99 + 34ef6922fb525dcecc8a3f9b7750414de93af438 - + https://github.com/dotnet/aspnetcore - fa54329186df2e11b40bdfec4ae08f16fdbe9d99 + 34ef6922fb525dcecc8a3f9b7750414de93af438 - + https://github.com/dotnet/aspnetcore - fa54329186df2e11b40bdfec4ae08f16fdbe9d99 + 34ef6922fb525dcecc8a3f9b7750414de93af438 - + https://github.com/dotnet/aspnetcore - fa54329186df2e11b40bdfec4ae08f16fdbe9d99 + 34ef6922fb525dcecc8a3f9b7750414de93af438 - + https://github.com/dotnet/aspnetcore - fa54329186df2e11b40bdfec4ae08f16fdbe9d99 + 34ef6922fb525dcecc8a3f9b7750414de93af438 - + https://github.com/dotnet/sdk - 4b128943b420ec8270905fdc671335d30779daea + 93371da74f630e33885305063b232abc0cd411bc - + https://github.com/dotnet/sdk - 4b128943b420ec8270905fdc671335d30779daea + 93371da74f630e33885305063b232abc0cd411bc - + https://github.com/dotnet/sdk - 4b128943b420ec8270905fdc671335d30779daea + 93371da74f630e33885305063b232abc0cd411bc - + https://github.com/dotnet/sdk - 4b128943b420ec8270905fdc671335d30779daea + 93371da74f630e33885305063b232abc0cd411bc https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 7453cb57f..a1cd41854 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,22 +71,22 @@ - 9.0.0-alpha.1.23470.9 - 9.0.0-alpha.1.23470.9 - 9.0.0-alpha.1.23470.9 - 9.0.0-alpha.1.23470.9 - 9.0.0-alpha.1.23470.9 - 9.0.0-alpha.1.23470.9 - 9.0.0-alpha.1.23470.9 + 9.0.0-alpha.1.23511.14 + 9.0.0-alpha.1.23511.14 + 9.0.0-alpha.1.23511.14 + 9.0.0-alpha.1.23511.14 + 9.0.0-alpha.1.23511.14 + 9.0.0-alpha.1.23511.14 + 9.0.0-alpha.1.23511.14 0.2.0 - 9.0.100-alpha.1.23512.3 - 9.0.100-alpha.1.23512.3 - 9.0.100-alpha.1.23512.3 + 9.0.100-alpha.1.23512.4 + 9.0.100-alpha.1.23512.4 + 9.0.100-alpha.1.23512.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From db90af89ad6f830068925bc1cb250f7ab9bdc294 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 12:15:45 +0000 Subject: [PATCH 083/109] Update dependencies from https://github.com/dotnet/arcade build 20231010.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk From 7c8e43e39a85123d7cfbe36568a85e3d1decb855 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 15:33:17 +0000 Subject: [PATCH 084/109] Update dependencies from https://github.com/dotnet/sdk build 20231012.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23512.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27dc0b31c..aae82ff47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/runtime - 5280006fb69e15a3a429ff34a9a0b2f3c2434000 + 8c21eadb558028181919be879bf125603546ff68 - + https://github.com/dotnet/runtime - 5280006fb69e15a3a429ff34a9a0b2f3c2434000 + 8c21eadb558028181919be879bf125603546ff68 - + https://github.com/dotnet/runtime - 5280006fb69e15a3a429ff34a9a0b2f3c2434000 + 8c21eadb558028181919be879bf125603546ff68 - + https://github.com/dotnet/runtime - 5280006fb69e15a3a429ff34a9a0b2f3c2434000 + 8c21eadb558028181919be879bf125603546ff68 - + https://github.com/dotnet/runtime - 5280006fb69e15a3a429ff34a9a0b2f3c2434000 + 8c21eadb558028181919be879bf125603546ff68 @@ -48,55 +48,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5280006fb69e15a3a429ff34a9a0b2f3c2434000 + 8c21eadb558028181919be879bf125603546ff68 - + https://github.com/dotnet/aspnetcore - 34ef6922fb525dcecc8a3f9b7750414de93af438 + 773ffa53a9837a2cec884ebf9c491e463a095120 - + https://github.com/dotnet/aspnetcore - 34ef6922fb525dcecc8a3f9b7750414de93af438 + 773ffa53a9837a2cec884ebf9c491e463a095120 - + https://github.com/dotnet/aspnetcore - 34ef6922fb525dcecc8a3f9b7750414de93af438 + 773ffa53a9837a2cec884ebf9c491e463a095120 - + https://github.com/dotnet/aspnetcore - 34ef6922fb525dcecc8a3f9b7750414de93af438 + 773ffa53a9837a2cec884ebf9c491e463a095120 - + https://github.com/dotnet/aspnetcore - 34ef6922fb525dcecc8a3f9b7750414de93af438 + 773ffa53a9837a2cec884ebf9c491e463a095120 - + https://github.com/dotnet/aspnetcore - 34ef6922fb525dcecc8a3f9b7750414de93af438 + 773ffa53a9837a2cec884ebf9c491e463a095120 - + https://github.com/dotnet/aspnetcore - 34ef6922fb525dcecc8a3f9b7750414de93af438 + 773ffa53a9837a2cec884ebf9c491e463a095120 - + https://github.com/dotnet/sdk - 93371da74f630e33885305063b232abc0cd411bc + f193a420d1e140e2daae900d6c6c503a1265403e - + https://github.com/dotnet/sdk - 93371da74f630e33885305063b232abc0cd411bc + f193a420d1e140e2daae900d6c6c503a1265403e - + https://github.com/dotnet/sdk - 93371da74f630e33885305063b232abc0cd411bc + f193a420d1e140e2daae900d6c6c503a1265403e - + https://github.com/dotnet/sdk - 93371da74f630e33885305063b232abc0cd411bc + f193a420d1e140e2daae900d6c6c503a1265403e https://github.com/dotnet/test-templates @@ -142,13 +142,13 @@ 89a55b6ca9270e3e12e3e158104518c225f5ed46 - + https://github.com/dotnet/runtime - 5280006fb69e15a3a429ff34a9a0b2f3c2434000 + 8c21eadb558028181919be879bf125603546ff68 - + https://github.com/dotnet/roslyn - 63cbcad96a6ba0f8f7eed4d8af51b6f7894167d4 + 17e4696ee6ed0a077650e8cabe6f507e2497a8da diff --git a/eng/Versions.props b/eng/Versions.props index a1cd41854..20bd4f999 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,41 +71,41 @@ - 9.0.0-alpha.1.23511.14 - 9.0.0-alpha.1.23511.14 - 9.0.0-alpha.1.23511.14 - 9.0.0-alpha.1.23511.14 - 9.0.0-alpha.1.23511.14 - 9.0.0-alpha.1.23511.14 - 9.0.0-alpha.1.23511.14 + 9.0.0-alpha.1.23511.15 + 9.0.0-alpha.1.23511.15 + 9.0.0-alpha.1.23511.15 + 9.0.0-alpha.1.23511.15 + 9.0.0-alpha.1.23511.15 + 9.0.0-alpha.1.23511.15 + 9.0.0-alpha.1.23511.15 0.2.0 - 9.0.100-alpha.1.23512.4 - 9.0.100-alpha.1.23512.4 - 9.0.100-alpha.1.23512.4 + 9.0.100-alpha.1.23512.13 + 9.0.100-alpha.1.23512.13 + 9.0.100-alpha.1.23512.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-1.23511.7 + 4.9.0-1.23511.8 - 9.0.0-alpha.1.23511.17 + 9.0.0-alpha.1.23511.18 - 9.0.0-alpha.1.23511.17 - 9.0.0-alpha.1.23511.17 - 9.0.0-alpha.1.23511.17 - 9.0.0-alpha.1.23511.17 - 9.0.0-alpha.1.23511.17 + 9.0.0-alpha.1.23511.18 + 9.0.0-alpha.1.23511.18 + 9.0.0-alpha.1.23511.18 + 9.0.0-alpha.1.23511.18 + 9.0.0-alpha.1.23511.18 8.0.0-rc.1.23414.4 2.1.0 From 53a08536e7f40dc9a920332d7d94ee11e618f4d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 17:15:44 +0000 Subject: [PATCH 085/109] Update dependencies from https://github.com/dotnet/sdk build 20231012.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23512.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++--------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aae82ff47..f4835d5bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 16efaf8b79a8924f02a8e7500bc7d81d1253007d - + https://github.com/dotnet/runtime - 8c21eadb558028181919be879bf125603546ff68 + b331f23f3fb62ae355a42d2ec9c8aefdd0da4073 - + https://github.com/dotnet/runtime - 8c21eadb558028181919be879bf125603546ff68 + b331f23f3fb62ae355a42d2ec9c8aefdd0da4073 - + https://github.com/dotnet/runtime - 8c21eadb558028181919be879bf125603546ff68 + b331f23f3fb62ae355a42d2ec9c8aefdd0da4073 - + https://github.com/dotnet/runtime - 8c21eadb558028181919be879bf125603546ff68 + b331f23f3fb62ae355a42d2ec9c8aefdd0da4073 - + https://github.com/dotnet/runtime - 8c21eadb558028181919be879bf125603546ff68 + b331f23f3fb62ae355a42d2ec9c8aefdd0da4073 @@ -48,55 +48,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 8c21eadb558028181919be879bf125603546ff68 + b331f23f3fb62ae355a42d2ec9c8aefdd0da4073 - + https://github.com/dotnet/aspnetcore - 773ffa53a9837a2cec884ebf9c491e463a095120 + 3d83ad986828391652e48ebd037c5f485b4edd26 - + https://github.com/dotnet/aspnetcore - 773ffa53a9837a2cec884ebf9c491e463a095120 + 3d83ad986828391652e48ebd037c5f485b4edd26 - + https://github.com/dotnet/aspnetcore - 773ffa53a9837a2cec884ebf9c491e463a095120 + 3d83ad986828391652e48ebd037c5f485b4edd26 - + https://github.com/dotnet/aspnetcore - 773ffa53a9837a2cec884ebf9c491e463a095120 + 3d83ad986828391652e48ebd037c5f485b4edd26 - + https://github.com/dotnet/aspnetcore - 773ffa53a9837a2cec884ebf9c491e463a095120 + 3d83ad986828391652e48ebd037c5f485b4edd26 - + https://github.com/dotnet/aspnetcore - 773ffa53a9837a2cec884ebf9c491e463a095120 + 3d83ad986828391652e48ebd037c5f485b4edd26 - + https://github.com/dotnet/aspnetcore - 773ffa53a9837a2cec884ebf9c491e463a095120 + 3d83ad986828391652e48ebd037c5f485b4edd26 - + https://github.com/dotnet/sdk - f193a420d1e140e2daae900d6c6c503a1265403e + 6eb64d8e26a43415150ed3f2a017ef83b1d89df9 - + https://github.com/dotnet/sdk - f193a420d1e140e2daae900d6c6c503a1265403e + 6eb64d8e26a43415150ed3f2a017ef83b1d89df9 - + https://github.com/dotnet/sdk - f193a420d1e140e2daae900d6c6c503a1265403e + 6eb64d8e26a43415150ed3f2a017ef83b1d89df9 - + https://github.com/dotnet/sdk - f193a420d1e140e2daae900d6c6c503a1265403e + 6eb64d8e26a43415150ed3f2a017ef83b1d89df9 https://github.com/dotnet/test-templates @@ -142,9 +142,9 @@ 89a55b6ca9270e3e12e3e158104518c225f5ed46 - + https://github.com/dotnet/runtime - 8c21eadb558028181919be879bf125603546ff68 + b331f23f3fb62ae355a42d2ec9c8aefdd0da4073 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 20bd4f999..b227c1d1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,22 +71,22 @@ - 9.0.0-alpha.1.23511.15 - 9.0.0-alpha.1.23511.15 - 9.0.0-alpha.1.23511.15 - 9.0.0-alpha.1.23511.15 - 9.0.0-alpha.1.23511.15 - 9.0.0-alpha.1.23511.15 - 9.0.0-alpha.1.23511.15 + 9.0.0-alpha.1.23512.8 + 9.0.0-alpha.1.23512.8 + 9.0.0-alpha.1.23512.8 + 9.0.0-alpha.1.23512.8 + 9.0.0-alpha.1.23512.8 + 9.0.0-alpha.1.23512.8 + 9.0.0-alpha.1.23512.8 0.2.0 - 9.0.100-alpha.1.23512.13 - 9.0.100-alpha.1.23512.13 - 9.0.100-alpha.1.23512.13 + 9.0.100-alpha.1.23512.14 + 9.0.100-alpha.1.23512.14 + 9.0.100-alpha.1.23512.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -97,15 +97,15 @@ - 9.0.0-alpha.1.23511.18 + 9.0.0-alpha.1.23512.2 - 9.0.0-alpha.1.23511.18 - 9.0.0-alpha.1.23511.18 - 9.0.0-alpha.1.23511.18 - 9.0.0-alpha.1.23511.18 - 9.0.0-alpha.1.23511.18 + 9.0.0-alpha.1.23512.2 + 9.0.0-alpha.1.23512.2 + 9.0.0-alpha.1.23512.2 + 9.0.0-alpha.1.23512.2 + 9.0.0-alpha.1.23512.2 8.0.0-rc.1.23414.4 2.1.0 From def3a3097641415ff05e56e4b6c252856c482c20 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 12 Oct 2023 11:15:02 -0700 Subject: [PATCH 086/109] Update the coresdk target and default tool TFM as well as the stage 0 SDK --- Directory.Build.props | 2 +- TestAssets/TestProjects/UseCswinrt/consolecswinrt.csproj | 2 +- global.json | 2 +- src/redist/targets/Crossgen.targets | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 767a2516b..5d0198439 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -26,7 +26,7 @@ true true - net8.0 + net9.0 - net8.0 + net9.0 $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk\tools\$(DefaultToolTfm)\ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.BlazorWebAssembly\tools\$(DefaultToolTfm)\ From 7f13c62d0ae12501c1af46c40d1324b83a24c0a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 18:25:39 +0000 Subject: [PATCH 087/109] Update dependencies from https://github.com/dotnet/sdk build 20231012.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23512.15 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.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 f4835d5bd..8ba5b9574 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 3d83ad986828391652e48ebd037c5f485b4edd26 - + https://github.com/dotnet/sdk - 6eb64d8e26a43415150ed3f2a017ef83b1d89df9 + a36f703483fa026d9fc69ccad5ec8c9bd657f19d - + https://github.com/dotnet/sdk - 6eb64d8e26a43415150ed3f2a017ef83b1d89df9 + a36f703483fa026d9fc69ccad5ec8c9bd657f19d - + https://github.com/dotnet/sdk - 6eb64d8e26a43415150ed3f2a017ef83b1d89df9 + a36f703483fa026d9fc69ccad5ec8c9bd657f19d - + https://github.com/dotnet/sdk - 6eb64d8e26a43415150ed3f2a017ef83b1d89df9 + a36f703483fa026d9fc69ccad5ec8c9bd657f19d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b227c1d1a..682b60fe1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23512.14 - 9.0.100-alpha.1.23512.14 - 9.0.100-alpha.1.23512.14 + 9.0.100-alpha.1.23512.15 + 9.0.100-alpha.1.23512.15 + 9.0.100-alpha.1.23512.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From becb8e5e6bb205cddfb706f13ba6f2a7941bb796 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 12 Oct 2023 11:45:52 -0700 Subject: [PATCH 088/109] downgrade windows desktop crossgen to net8.0 as they aren't on 9 yet to get some build/test results --- src/redist/targets/Crossgen.targets | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 9d43d4a29..d32e82555 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -38,12 +38,14 @@ update its path explicitly. If all TFMs match, update DefaultToolTfm --> net9.0 + + net8.0 $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk\tools\$(DefaultToolTfm)\ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.BlazorWebAssembly\tools\$(DefaultToolTfm)\ $(SdkOutputDirectory)Sdks\NuGet.Build.Tasks.Pack\CoreCLR\ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Razor\tasks\$(DefaultToolTfm)\ - $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.WindowsDesktop\tools\$(DefaultToolTfm)\ + $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.WindowsDesktop\tools\$(PreviousToolTfm)\ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Publish\tools\$(DefaultToolTfm)\ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web\tools\$(DefaultToolTfm)\ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web.ProjectSystem\tools\$(DefaultToolTfm)\ From 24f9beb4d84f0b4aa03d380c76b181a79e14f6ec Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 12 Oct 2023 15:50:19 -0500 Subject: [PATCH 089/109] License scanning for VMR (#17522) --- eng/install-scancode.sh | 22 ++ eng/pipelines/source-build-license-scan.yml | 137 +++++++++ .../content/docs/license-scanning.md | 24 ++ .../BaselineHelper.cs | 9 +- .../BasicScenarioTests.cs | 2 +- .../Config.cs | 9 +- .../DebugTests.cs | 2 +- .../DotNetFormatTests.cs | 2 +- .../DotNetHelper.cs | 10 +- .../DotNetWatchTests.cs | 2 +- .../LicenseScanTests.cs | 291 ++++++++++++++++++ .../OmniSharpTests.cs | 2 +- .../PoisonTests.cs | 2 +- .../SdkContentTests.cs | 31 +- .../{SmokeTests.cs => SdkTests.cs} | 8 +- .../SourceBuiltArtifactsTests.cs | 5 +- .../TestBase.cs | 25 ++ .../Utilities.cs | 32 ++ .../WebScenarioTests.cs | 2 +- .../assets/LicenseExclusions.txt | 257 ++++++++++++++++ .../baselines/licenses/Licenses.arcade.json | 3 + .../licenses/Licenses.aspnetcore.json | 3 + .../baselines/licenses/Licenses.cecil.json | 3 + .../licenses/Licenses.command-line-api.json | 3 + .../licenses/Licenses.deployment-tools.json | 3 + .../licenses/Licenses.diagnostics.json | 3 + .../baselines/licenses/Licenses.emsdk.json | 3 + .../baselines/licenses/Licenses.format.json | 3 + .../baselines/licenses/Licenses.fsharp.json | 3 + .../licenses/Licenses.installer.json | 3 + .../baselines/licenses/Licenses.msbuild.json | 3 + .../licenses/Licenses.nuget-client.json | 3 + .../baselines/licenses/Licenses.razor.json | 3 + .../licenses/Licenses.roslyn-analyzers.json | 3 + .../baselines/licenses/Licenses.roslyn.json | 3 + .../baselines/licenses/Licenses.runtime.json | 20 ++ .../baselines/licenses/Licenses.sdk.json | 3 + .../Licenses.source-build-externals.json | 12 + ...enses.source-build-reference-packages.json | 3 + .../licenses/Licenses.sourcelink.json | 3 + .../licenses/Licenses.symreader.json | 3 + .../licenses/Licenses.templating.json | 3 + .../licenses/Licenses.test-templates.json | 3 + .../baselines/licenses/Licenses.vstest.json | 3 + .../baselines/licenses/Licenses.xdt.json | 3 + .../licenses/Licenses.xliff-tasks.json | 3 + 46 files changed, 924 insertions(+), 54 deletions(-) create mode 100644 eng/install-scancode.sh create mode 100644 eng/pipelines/source-build-license-scan.yml create mode 100644 src/SourceBuild/content/docs/license-scanning.md create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs rename src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/{SmokeTests.cs => SdkTests.cs} (66%) create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestBase.cs create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.arcade.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspnetcore.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.cecil.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.command-line-api.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.deployment-tools.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.diagnostics.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.emsdk.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.format.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.fsharp.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.installer.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.msbuild.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.nuget-client.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.razor.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.roslyn-analyzers.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.roslyn.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.runtime.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.sdk.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.source-build-externals.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.source-build-reference-packages.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.sourcelink.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.symreader.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.templating.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.test-templates.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.vstest.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.xdt.json create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.xliff-tasks.json diff --git a/eng/install-scancode.sh b/eng/install-scancode.sh new file mode 100644 index 000000000..9b705f624 --- /dev/null +++ b/eng/install-scancode.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +set -euo pipefail + +# https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-as-a-library-via-pip + +pyEnvPath="/tmp/scancode-env" +python3 -m venv $pyEnvPath +source $pyEnvPath/bin/activate +pip install scancode-toolkit +deactivate + +# Setup a script which executes scancode in the virtual environment +cat > /usr/local/bin/scancode << EOF +#!/bin/bash +set -euo pipefail +source $pyEnvPath/bin/activate +scancode "\$@" +deactivate +EOF + +chmod +x /usr/local/bin/scancode diff --git a/eng/pipelines/source-build-license-scan.yml b/eng/pipelines/source-build-license-scan.yml new file mode 100644 index 000000000..bcf7e84f1 --- /dev/null +++ b/eng/pipelines/source-build-license-scan.yml @@ -0,0 +1,137 @@ +# Pipeline documentation at https://github.com/dotnet/dotnet/blob/main/docs/license-scanning.md + +schedules: +- cron: "0 7 * * 1-5" + displayName: Run on weekdays at 7am UTC + branches: + include: + - main + - release/* + +pr: none +trigger: none + +parameters: +# Provides a way to scan a specific repo. If not provided, all repos of the VMR will be scanned. +- name: specificRepoName + type: string + displayName: "Specific repo name to scan (e.g. runtime, sdk). If empty, scans all repos of the VMR." + default: " " # Set it to an empty string to allow it be an optional parameter + +variables: + installerRoot: '$(Build.SourcesDirectory)/src/installer' + +jobs: +- job: Setup + pool: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals 1es-ubuntu-2004 + steps: + - script: | + vmrSrcDir="$(Build.SourcesDirectory)/src" + + # Builds an Azure DevOps matrix definition. Each entry in the matrix is a path, + # allowing a job to be run for each src repo. + matrix="" + + # Trim leading/trailing spaces from the repo name + specificRepoName=$(echo "${{ parameters.specificRepoName }}" | awk '{$1=$1};1') + + # If the repo name is provided, only scan that repo. + if [ ! -z "$specificRepoName" ]; then + matrix="\"$specificRepoName\": { \"repoPath\": \"$vmrSrcDir/$specificRepoName\" }" + else + for dir in $vmrSrcDir/*/ + do + if [ ! -z "$matrix" ]; then + matrix="$matrix," + fi + repoName=$(basename $dir) + matrix="$matrix \"$repoName\": { \"repoPath\": \"$dir\" }" + done + fi + + matrix="{ $matrix }" + + echo "##vso[task.setvariable variable=matrix;isOutput=true]$matrix" + name: GetMatrix + displayName: Get Matrix + +- job: LicenseScan + dependsOn: Setup + pool: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals 1es-ubuntu-2004 + timeoutInMinutes: 420 + strategy: + matrix: $[ dependencies.Setup.outputs['GetMatrix.matrix'] ] + steps: + + - script: $(Build.SourcesDirectory)/prep.sh --no-artifacts --no-bootstrap --no-prebuilts + displayName: 'Install .NET SDK' + + - task: PipAuthenticate@1 + displayName: 'Pip Authenticate' + inputs: + artifactFeeds: public/dotnet-public-pypi + onlyAddExtraIndex: false + + - script: $(installerRoot)/eng/install-scancode.sh + displayName: Install Scancode + + - script: > + $(Build.SourcesDirectory)/.dotnet/dotnet test + $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj + --filter "FullyQualifiedName=Microsoft.DotNet.SourceBuild.SmokeTests.LicenseScanTests.ScanForLicenses" + --logger:'trx;LogFileName=$(Agent.JobName)_LicenseScan.trx' + --logger:'console;verbosity=detailed' + -c Release + -bl:$(Build.SourcesDirectory)/artifacts/log/Debug/BuildTests_$(date +"%m%d%H%M%S").binlog + -flp:LogFile=$(Build.SourcesDirectory)/artifacts/logs/BuildTests_$(date +"%m%d%H%M%S").log + -clp:v=m + -e SMOKE_TESTS_LICENSE_SCAN_PATH=$(repoPath) + -e SMOKE_TESTS_RUNNING_IN_CI=true + -e SMOKE_TESTS_WARN_LICENSE_SCAN_DIFFS=false + -e SMOKE_TESTS_TARGET_RID=linux-x64 + -e SMOKE_TESTS_PORTABLE_RID=linux-x64 + displayName: Run Tests + workingDirectory: $(Build.SourcesDirectory) + + - script: | + set -x + targetFolder=$(Build.StagingDirectory)/BuildLogs/ + mkdir -p ${targetFolder} + cd "$(Build.SourcesDirectory)" + find artifacts/ -type f -name "BuildTests*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/ -type f -name "BuildTests*.log" -exec cp {} --parents -t ${targetFolder} \; + echo "Updated:" + find test/ -type f -name "Updated*.json" + find test/ -type f -name "Updated*.json" -exec cp {} --parents -t ${targetFolder} \; + echo "Results:" + find test/ -type f -name "scancode-results*.json" + find test/ -type f -name "scancode-results*.json" -exec cp {} --parents -t ${targetFolder} \; + echo "All:" + ls -R test/ + echo "BuildLogs:" + ls -R ${targetFolder} + displayName: Prepare BuildLogs staging directory + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() + + - task: PublishTestResults@2 + displayName: Publish Test Results + condition: succeededOrFailed() + continueOnError: true + inputs: + testRunner: vSTest + testResultsFiles: '*.trx' + searchFolder: $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestResults + mergeTestResults: true + publishRunAttachments: true + testRunTitle: $(Agent.JobName) diff --git a/src/SourceBuild/content/docs/license-scanning.md b/src/SourceBuild/content/docs/license-scanning.md new file mode 100644 index 000000000..6007776ab --- /dev/null +++ b/src/SourceBuild/content/docs/license-scanning.md @@ -0,0 +1,24 @@ +# License Scanning + +The VMR is regularly scanned for license references to ensure that only open-source license are used where relevant. + +License scanning pipline: https://dev.azure.com/dnceng/internal/_build?definitionId=1301 (internal only) + +License scanning test: https://github.com/dotnet/dotnet/blob/main/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs + +By default, running the pipeline will scan all repos within the VMR which takes several hours to run. +The pipeline can be triggered manually to target a specific repo within the VMR by setting the `specificRepoName` parameter. +This value should be the name of the repo within the VMR (i.e. a name of a directory within https://github.com/dotnet/dotnet/tree/main/src). +To test source modifications intended to resolve a license issue, apply the change in an internal branch of the VMR. +Run this pipeline, targeting your branch, and set the `specificRepoName` parameter to the name of the repo containing the change. + +The output of the pipeline is a set of test results and logs. +The logs are published as an artifact and can be found at test/Microsoft.DotNet/SourceBuild.SmokeTests/bin/Release/netX.0/logs. +It consists of the following: + * `UpdatedLicenses..json`: This is the output of that gets compared to the stored baseline. + If they're the same, the test passes; if not, it fails. By comparing this file to the baseline, one can determine which new license + references have been introduced. + If everything is deemed to be acceptable, the developer can either update the allowed licenses, update the exclusions file, update the + baseline, or any combination. + * `scancode-results.json`: This is the raw output that comes from scancode. This file is useful for diagnostic purposes because it tells you + the exact line number of where a license has been detected in a file. diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs index f5bf4ebe8..6b7c6f71a 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs @@ -41,12 +41,12 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests Assert.Null(message); } - public static void CompareBaselineContents(string baselineFileName, string actualContents, ITestOutputHelper outputHelper, bool warnOnDiffs = false) + public static void CompareBaselineContents(string baselineFileName, string actualContents, ITestOutputHelper outputHelper, bool warnOnDiffs = false, string baselineSubDir = "") { - string actualFilePath = Path.Combine(DotNetHelper.LogsDirectory, $"Updated{baselineFileName}"); + string actualFilePath = Path.Combine(TestBase.LogsDirectory, $"Updated{baselineFileName}"); File.WriteAllText(actualFilePath, actualContents); - CompareFiles(GetBaselineFilePath(baselineFileName), actualFilePath, outputHelper, warnOnDiffs); + CompareFiles(GetBaselineFilePath(baselineFileName, baselineSubDir), actualFilePath, outputHelper, warnOnDiffs); } public static void CompareFiles(string expectedFilePath, string actualFilePath, ITestOutputHelper outputHelper, bool warnOnDiffs = false) @@ -87,7 +87,8 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests public static string GetAssetsDirectory() => Path.Combine(Directory.GetCurrentDirectory(), "assets"); - public static string GetBaselineFilePath(string baselineFileName) => Path.Combine(GetAssetsDirectory(), "baselines", baselineFileName); + public static string GetBaselineFilePath(string baselineFileName, string baselineSubDir = "") => + Path.Combine(GetAssetsDirectory(), "baselines", baselineSubDir, baselineFileName); public static string RemoveRids(string diff, bool isPortable = false) => isPortable ? diff.Replace(Config.PortableRid, "portable-rid") : diff.Replace(Config.TargetRid, "banana-rid"); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs index cb008eccc..493898ab8 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs @@ -15,7 +15,7 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; /// for related web scenarios. /// They are encapsulated in a separate testclass so that they can be run in parallel. /// -public class BasicScenarioTests : SmokeTests +public class BasicScenarioTests : SdkTests { public BasicScenarioTests(ITestOutputHelper outputHelper) : base(outputHelper) { } diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs index 080e19d67..6bc2393e8 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs @@ -21,7 +21,9 @@ internal static class Config public const string SourceBuiltArtifactsPathEnv = "SMOKE_TESTS_SOURCEBUILT_ARTIFACTS_PATH"; public const string TargetRidEnv = "SMOKE_TESTS_TARGET_RID"; public const string WarnSdkContentDiffsEnv = "SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS"; + public const string WarnLicenseScanDiffsEnv = "SMOKE_TESTS_WARN_LICENSE_SCAN_DIFFS"; public const string RunningInCIEnv = "SMOKE_TESTS_RUNNING_IN_CI"; + public const string LicenseScanPathEnv = "SMOKE_TESTS_LICENSE_SCAN_PATH"; public static string DotNetDirectory { get; } = Environment.GetEnvironmentVariable(DotNetDirectoryEnv) ?? Path.Combine(Directory.GetCurrentDirectory(), ".dotnet"); @@ -32,15 +34,18 @@ internal static class Config public static string? PrereqsPath { get; } = Environment.GetEnvironmentVariable(PrereqsPathEnv); public static string? CustomPackagesPath { get; } = Environment.GetEnvironmentVariable(CustomPackagesPathEnv); public static string? SdkTarballPath { get; } = Environment.GetEnvironmentVariable(SdkTarballPathEnv); - public static string SourceBuiltArtifactsPath { get; } = Environment.GetEnvironmentVariable(SourceBuiltArtifactsPathEnv) ?? - throw new InvalidOperationException($"'{Config.SourceBuiltArtifactsPathEnv}' must be specified"); + public static string? SourceBuiltArtifactsPath { get; } = Environment.GetEnvironmentVariable(SourceBuiltArtifactsPathEnv); public static string TargetRid { get; } = Environment.GetEnvironmentVariable(TargetRidEnv) ?? throw new InvalidOperationException($"'{Config.TargetRidEnv}' must be specified"); public static string TargetArchitecture { get; } = TargetRid.Split('-')[1]; public static bool WarnOnSdkContentDiffs { get; } = bool.TryParse(Environment.GetEnvironmentVariable(WarnSdkContentDiffsEnv), out bool warnOnSdkContentDiffs) && warnOnSdkContentDiffs; + public static bool WarnOnLicenseScanDiffs { get; } = + bool.TryParse(Environment.GetEnvironmentVariable(WarnLicenseScanDiffsEnv), out bool warnOnLicenseScanDiffs) && warnOnLicenseScanDiffs; // Indicates whether the tests are being run in the context of a CI pipeline public static bool RunningInCI { get; } = bool.TryParse(Environment.GetEnvironmentVariable(RunningInCIEnv), out bool runningInCI) && runningInCI; + + public static string? LicenseScanPath { get; } = Environment.GetEnvironmentVariable(LicenseScanPathEnv); } diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DebugTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DebugTests.cs index 939339207..c556b0e90 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DebugTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DebugTests.cs @@ -12,7 +12,7 @@ using Xunit.Abstractions; namespace Microsoft.DotNet.SourceBuild.SmokeTests; -public class DebugTests : SmokeTests +public class DebugTests : SdkTests { private record ScanResult(string FileName, bool HasDebugInfo, bool HasDebugAbbrevs, bool HasFileSymbols, bool HasGnuDebugLink); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs index b92d0263a..13836de31 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs @@ -8,7 +8,7 @@ using Xunit.Abstractions; namespace Microsoft.DotNet.SourceBuild.SmokeTests; -public class DotNetFormatTests : SmokeTests +public class DotNetFormatTests : SdkTests { private const string TestFileName = "FormatTest.cs"; private const string UnformattedFileName = "FormatTestUnformatted.cs"; diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs index 8e8f2521d..9fe99298e 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs @@ -3,14 +3,12 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; using System.Net; using System.Net.Http; using System.Net.Sockets; -using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -21,7 +19,6 @@ internal class DotNetHelper private static readonly object s_lockObj = new(); public static string DotNetPath { get; } = Path.Combine(Config.DotNetDirectory, "dotnet"); - public static string LogsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "logs"); public static string PackagesDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "packages"); public static string ProjectsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), $"projects-{DateTime.Now:yyyyMMddHHmmssffff}"); @@ -56,11 +53,6 @@ internal class DotNetHelper { Directory.CreateDirectory(PackagesDirectory); } - - if (!Directory.Exists(LogsDirectory)) - { - Directory.CreateDirectory(LogsDirectory); - } } } @@ -265,7 +257,7 @@ internal class DotNetHelper fileName += $"-{differentiator}"; } - return $"/bl:{Path.Combine(LogsDirectory, $"{fileName}.binlog")}"; + return $"/bl:{Path.Combine(TestBase.LogsDirectory, $"{fileName}.binlog")}"; } private static bool DetermineIsMonoRuntime(string dotnetRoot) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs index 3fbc04899..8594c67d2 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs @@ -9,7 +9,7 @@ using Xunit.Abstractions; namespace Microsoft.DotNet.SourceBuild.SmokeTests; -public class DotNetWatchTests : SmokeTests +public class DotNetWatchTests : SdkTests { public DotNetWatchTests(ITestOutputHelper outputHelper) : base(outputHelper) { } diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs new file mode 100644 index 000000000..6ddf668c5 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs @@ -0,0 +1,291 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.Text.RegularExpressions; +using Xunit; +using Xunit.Abstractions; + +namespace Microsoft.DotNet.SourceBuild.SmokeTests; + +/// +/// Scans the VMR for licenses and compares them to a baseline. This ensures that only open-source licenses are used for relevant files. +/// +/// +/// Each sub-repo of the VMR is scanned separately because of the amount of time it takes. +/// When scanning is run, the test provides a list of files for the scanner to ignore. These include binary file types. It also includes +/// .il/.ildump file types which are massive, causing the scanner to choke and don't include license references anyway. +/// Once the scanner returns the results, a filtering process occurs. First, any detected license that is in the allowed list of licenses +/// is filtered out. The test defines a list of such licenses that all represent open-source licenses. Next, a license exclusions file is +/// applied to the filtering. This file contains a set of paths for which certain detected licenses are to be ignored. Such a path can be +/// defined to ignore all detected licenses or specific ones. These exclusions are useful for ignoring false positives where the scanning +/// tool has detected something in the file that makes it think it's a license reference when that's not actually the intent. Other cases +/// that are excluded are when the license is meant as configuration or test data and not actually applying to the code. These exclusions +/// further filter down the set of the detected licenses for each file. Everything that's left at this point is reported. It gets compared +/// to a baseline file (which is defined for each sub-repo). If the filtered results differ from what's defined in the baseline, the test fails. +/// +/// Rules for determining how to resolve a detected license: +/// 1. If it's an allowed open-source license, add it to the list of allowed licenses in LicenseScanTests.cs. +/// 2. If the file shouldn't be scanned as a general rule because of its file type (e.g. image file), add it to the list of excluded file types in LicenseScanTests.cs. +/// 3. Add it to LicenseExclusions.txt if the referenced license is one of the following: +/// a. Not applicable (e.g. test data) +/// b. False positive +/// 4. If the license is not allowed for open-souce, the license needs to be fixed. Everything else should go in the baseline file. +/// +public class LicenseScanTests : TestBase +{ + private const string BaselineSubDir = "licenses"; + + private static readonly string[] s_allowedLicenseExpressions = new string[] + { + "apache-1.1", // https://opensource.org/license/apache-1-1/ + "apache-2.0", // https://opensource.org/license/apache-2-0/ + "apache-2.0 WITH apple-runtime-library-exception", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/apple-runtime-library-exception.LICENSE + "apache-2.0 WITH llvm-exception", // https://foundation.llvm.org/relicensing/LICENSE.txt + "apsl-2.0", // https://opensource.org/license/apsl-2-0-php/ + "boost-1.0", // https://opensource.org/license/bsl-1-0/ + "bsd-new", // https://opensource.org/license/BSD-3-clause/ + "bsd-original", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/bsd-original.LICENSE + "bsd-original-uc", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/bsd-original-uc.LICENSE + "bsd-simplified", // https://opensource.org/license/bsd-2-clause/ + "bytemark", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/bytemark.LICENSE + "bzip2-libbzip-2010", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/bzip2-libbzip-2010.LICENSE + "cc0-1.0", // https://creativecommons.org/publicdomain/zero/1.0/legalcode + "cc-by-3.0", // https://creativecommons.org/licenses/by/3.0/legalcode + "cc-by-sa-3.0", // https://creativecommons.org/licenses/by-sa/3.0/legalcode + "cc-by-sa-4.0", // https://creativecommons.org/licenses/by-sa/4.0/legalcode + "cc-pd", // https://creativecommons.org/publicdomain/mark/1.0/ + "epl-1.0", // https://opensource.org/license/epl-1-0/ + "generic-cla", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/generic-cla.LICENSE + "gpl-1.0-plus", // https://opensource.org/license/gpl-1-0/ + "gpl-2.0", // https://opensource.org/license/gpl-2-0/ + "ietf", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/ietf.LICENSE + "gpl-2.0-plus WITH autoconf-simple-exception-2.0", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_autoconf-simple-exception-2.0_8.RULE + "gpl-2.0 WITH gcc-linking-exception-2.0", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/rules/gpl-2.0_with_gcc-linking-exception-2.0_6.RULE + "isc", // https://opensource.org/license/isc-license-txt/ + "iso-8879", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/iso-8879.LICENSE + "lgpl-2.0-plus", // https://opensource.org/license/lgpl-2-0/ + "lgpl-2.1", // https://opensource.org/license/lgpl-2-1/ + "lgpl-2.1-plus", // https://opensource.org/license/lgpl-2-1/ + "mit", // https://opensource.org/license/mit/ + "mit-addition", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/mit-addition.LICENSE + "ms-patent-promise", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/ms-patent-promise.LICENSE + "ms-lpl", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/ms-lpl.LICENSE + "ms-pl", // https://opensource.org/license/ms-pl-html/ + "ms-rl", // https://opensource.org/license/ms-rl-html/ + "newton-king-cla", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/newton-king-cla.LICENSE + "ngpl", // https://opensource.org/license/nethack-php/ + "object-form-exception-to-mit", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/object-form-exception-to-mit.LICENSE + "ofl-1.1", // https://opensource.org/license/ofl-1-1/ + "osf-1990", // https://fedoraproject.org/wiki/Licensing:MIT?rd=Licensing/MIT#HP_Variant + "public-domain", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/public-domain.LICENSE + "public-domain-disclaimer", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/public-domain-disclaimer.LICENSE + "python", // https://opensource.org/license/python-2-0/ + "rpl-1.5", // https://opensource.org/license/rpl-1-5/ + "sax-pd", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/sax-pd.LICENSE + "unicode", // https://opensource.org/license/unicode-inc-license-agreement-data-files-and-software/ + "unicode-mappings", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/unicode-mappings.LICENSE + "uoi-ncsa", // https://opensource.org/license/uoi-ncsa-php/ + "w3c-software-19980720", // https://opensource.org/license/w3c/ + "w3c-software-doc-20150513", // https://opensource.org/license/w3c/ + "warranty-disclaimer", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/warranty-disclaimer.LICENSE + "x11", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/x11.LICENSE + "zlib" // https://opensource.org/license/zlib/ + }; + + private static readonly string[] s_ignoredFilePatterns = new string[] + { + "*.bin", + "*.bmp", + "*.bson", + "*.db", + "*.dic", + "*.eot", + "*.gif", + "*.ico", + "*.jpg", + "*.il", + "*.ildump", + "*.lss", + "*.nlp", + "*.otf", + "*.pdf", + "*.pfx", + "*.png", + "*.snk", + "*.ttf", + "*.vsd", + "*.vsdx", + "*.winmd", + "*.woff", + "*.woff2", + "*.xlsx", + }; + + private readonly string _targetRepo; + + public LicenseScanTests(ITestOutputHelper outputHelper) : base(outputHelper) + { + Assert.NotNull(Config.LicenseScanPath); + _targetRepo = new DirectoryInfo(Config.LicenseScanPath).Name; + } + + [SkippableFact(Config.LicenseScanPathEnv, skipOnNullOrWhiteSpaceEnv: true)] + public void ScanForLicenses() + { + Assert.NotNull(Config.LicenseScanPath); + + string OriginalScancodeResultsPath = Path.Combine(LogsDirectory, "scancode-results-original.json"); + string FilteredScancodeResultsPath = Path.Combine(LogsDirectory, "scancode-results-filtered.json"); + + // Scancode Doc: https://scancode-toolkit.readthedocs.io/en/latest/index.html + string ignoreOptions = string.Join(" ", s_ignoredFilePatterns.Select(pattern => $"--ignore {pattern}")); + ExecuteHelper.ExecuteProcessValidateExitCode( + "scancode", + $"--license --strip-root --only-findings {ignoreOptions} --json-pp {OriginalScancodeResultsPath} {Config.LicenseScanPath}", + OutputHelper); + + JsonDocument doc = JsonDocument.Parse(File.ReadAllText(OriginalScancodeResultsPath)); + ScancodeResults? scancodeResults = doc.Deserialize(); + Assert.NotNull(scancodeResults); + + FilterFiles(scancodeResults); + + JsonSerializerOptions options = new() + { + WriteIndented = true + }; + string json = JsonSerializer.Serialize(scancodeResults, options); + File.WriteAllText(FilteredScancodeResultsPath, json); + + string baselineName = $"Licenses.{_targetRepo}.json"; + + string baselinePath = BaselineHelper.GetBaselineFilePath(baselineName, BaselineSubDir); + if (!File.Exists(baselinePath)) + { + Assert.Fail($"No license baseline file exists for repo '{_targetRepo}'. Expected file: {baselinePath}"); + } + + BaselineHelper.CompareBaselineContents(baselineName, json, OutputHelper, Config.WarnOnLicenseScanDiffs, BaselineSubDir); + } + + private LicenseExclusion ParseLicenseExclusion(string rawExclusion) + { + string[] parts = rawExclusion.Split('|', StringSplitOptions.RemoveEmptyEntries); + + Match repoNameMatch = Regex.Match(parts[0], @"(?<=src/)[^/]+"); + + Assert.True(repoNameMatch.Success); + + // The path in the exclusion file is rooted from the VMR. But the path in the scancode results is rooted from the + // target repo within the VMR. So we need to strip off the beginning part of the path. + Match restOfPathMatch = Regex.Match(parts[0], @"(?<=src/[^/]+/).*"); + string path = restOfPathMatch.Value; + + if (parts.Length == 0 || parts.Length > 2) + { + throw new Exception($"Invalid license exclusion: '{rawExclusion}'"); + } + + if (parts.Length > 1) + { + string[] licenseExpressions = parts[1].Split(',', StringSplitOptions.RemoveEmptyEntries); + return new LicenseExclusion(repoNameMatch.Value, path, licenseExpressions); + } + else + { + return new LicenseExclusion(repoNameMatch.Value, path, Enumerable.Empty()); + } + } + + private void FilterFiles(ScancodeResults scancodeResults) + { + IEnumerable rawExclusions = Utilities.ParseExclusionsFile("LicenseExclusions.txt"); + IEnumerable exclusions = rawExclusions + .Select(exclusion => ParseLicenseExclusion(exclusion)) + .Where(exclusion => exclusion.Repo == _targetRepo) + .ToList(); + + // This will filter out files that we don't want to include in the baseline. + // Filtering can happen in two ways: + // 1. There are a set of allowed license expressions that apply to all files. If a file has a match on one of those licenses, + // that license will not be considered. + // 2. The LicenseExclusions.txt file contains a list of files and the licenses that should be excluded from those files. + // Once the license expression filtering has been applied, if a file has any licenses left, it will be included in the baseline. + // In that case, the baseline will list all of the licenses for that file, even if some were originally excluded during this processing. + // In other words, the baseline will be fully representative of the licenses that apply to the files that are listed there. + + for (int i = scancodeResults.Files.Count - 1; i >= 0; i--) + { + ScancodeFileResult file = scancodeResults.Files[i]; + + // A license expression can be a logical expression, e.g. "(MIT OR Apache-2.0)" + // For our purposes, we just care about the license involved, not the semantics of the expression. + // Parse out all the expression syntax to just get the license names. + string[] licenses = file.LicenseExpression? + .Replace("(", string.Empty) + .Replace(")", string.Empty) + .Replace(" AND ", ",") + .Replace(" OR ", ",") + .Split(",", StringSplitOptions.RemoveEmptyEntries) + .Select(license => license.Trim()) + .ToArray() + ?? Array.Empty(); + + // First check whether the file's licenses can all be matched with allowed expressions + IEnumerable disallowedLicenses = licenses + .Where(license => !s_allowedLicenseExpressions.Contains(license, StringComparer.OrdinalIgnoreCase)); + + if (!disallowedLicenses.Any()) + { + scancodeResults.Files.Remove(file); + } + else + { + // There are some licenses that are not allowed. Now check whether the file is excluded. + + IEnumerable matchingExclusions = + Utilities.GetMatchingFileExclusions(file.Path, exclusions, exclusion => exclusion.Path); + + IEnumerable excludedLicenses = matchingExclusions.SelectMany(exclusion => exclusion.LicenseExpressions); + // If no licenses are explicitly specified, it means they're all excluded. + if (matchingExclusions.Any() && !excludedLicenses.Any()) + { + scancodeResults.Files.Remove(file); + } + else + { + IEnumerable remainingLicenses = disallowedLicenses.Except(excludedLicenses); + + if (!remainingLicenses.Any()) + { + scancodeResults.Files.Remove(file); + } + } + } + } + } + + private record LicenseExclusion(string Repo, string Path, IEnumerable LicenseExpressions); + + private class ScancodeResults + { + [JsonPropertyName("files")] + public List Files { get; set; } = new(); + } + + private class ScancodeFileResult + { + [JsonPropertyName("path")] + public string Path { get; set; } = string.Empty; + + [JsonPropertyName("detected_license_expression")] + public string? LicenseExpression { get; set; } + } +} diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs index 751b2ebeb..c604ed94a 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs @@ -16,7 +16,7 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; /// /// OmniSharp tests to ensure it works with a source-built sdk. /// -public class OmniSharpTests : SmokeTests +public class OmniSharpTests : SdkTests { // Update version as new releases become available: https://github.com/OmniSharp/omnisharp-roslyn/releases private const string OmniSharpReleaseVersion = "1.39.8"; diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs index 6eb8203f5..cf2e1182b 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs @@ -9,7 +9,7 @@ using Xunit.Abstractions; namespace Microsoft.DotNet.SourceBuild.SmokeTests { - public class PoisonTests : SmokeTests + public class PoisonTests : SdkTests { public PoisonTests(ITestOutputHelper outputHelper) : base(outputHelper) { } diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs index d3b0c8a26..29bb7dbc5 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs @@ -17,7 +17,7 @@ using Xunit.Abstractions; namespace Microsoft.DotNet.SourceBuild.SmokeTests; [Trait("Category", "SdkContent")] -public class SdkContentTests : SmokeTests +public class SdkContentTests : SdkTests { private const string MsftSdkType = "msft"; private const string SourceBuildSdkType = "sb"; @@ -98,7 +98,7 @@ public class SdkContentTests : SmokeTests if (sbVersion is not null && msftVersion is not null && sbVersion >= msftVersion && - IsFileExcluded(assemblyPath, assemblyVersionDiffFilters)) + Utilities.IsFileExcluded(assemblyPath, assemblyVersionDiffFilters)) { sbSdkAssemblyVersions.Remove(assemblyPath); msftSdkAssemblyVersions.Remove(assemblyPath); @@ -182,7 +182,7 @@ public class SdkContentTests : SmokeTests string relativePath = Path.GetRelativePath(sbSdkPath, file); string normalizedPath = BaselineHelper.RemoveVersions(relativePath); - if (!IsFileExcluded(normalizedPath, exclusionFilters)) + if (!Utilities.IsFileExcluded(normalizedPath, exclusionFilters)) { sbSdkAssemblyVersions.Add(normalizedPath, GetVersion(assemblyName)); } @@ -208,32 +208,13 @@ public class SdkContentTests : SmokeTests } private static IEnumerable RemoveExclusions(IEnumerable files, IEnumerable exclusions) => - files.Where(item => !IsFileExcluded(item, exclusions)); - - private static bool IsFileExcluded(string filePath, IEnumerable exclusions) => - exclusions.Any(p => FileSystemName.MatchesSimpleExpression(p, filePath)); + files.Where(item => !Utilities.IsFileExcluded(item, exclusions)); private static IEnumerable GetSdkDiffExclusionFilters(string sdkType) => - ParseExclusionsFile("SdkFileDiffExclusions.txt", sdkType); + Utilities.ParseExclusionsFile("SdkFileDiffExclusions.txt", sdkType); private static IEnumerable GetSdkAssemblyVersionDiffExclusionFilters() => - ParseExclusionsFile("SdkAssemblyVersionDiffExclusions.txt"); - - private static IEnumerable ParseExclusionsFile(string exclusionsFileName, string? prefix = null) - { - string exclusionsFilePath = Path.Combine(BaselineHelper.GetAssetsDirectory(), exclusionsFileName); - int prefixSkip = prefix?.Length + 1 ?? 0; - return File.ReadAllLines(exclusionsFilePath) - // process only specific sdk exclusions if a prefix is provided - .Where(line => prefix is null || line.StartsWith(prefix + ",")) - .Select(line => - { - // Ignore comments - var index = line.IndexOf('#'); - return index >= 0 ? line[prefixSkip..index].TrimEnd() : line[prefixSkip..]; - }) - .ToList(); - } + Utilities.ParseExclusionsFile("SdkAssemblyVersionDiffExclusions.txt"); private static string RemoveDiffMarkers(string source) { diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkTests.cs similarity index 66% rename from src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkTests.cs index 3c197262b..ba3381360 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkTests.cs @@ -7,16 +7,14 @@ using Xunit.Abstractions; namespace Microsoft.DotNet.SourceBuild.SmokeTests; /// -/// Shared base class for all smoke tests. +/// Shared base class for all SDK-based smoke tests. /// -public abstract class SmokeTests +public abstract class SdkTests : TestBase { internal DotNetHelper DotNetHelper { get; } - internal ITestOutputHelper OutputHelper { get; } - protected SmokeTests(ITestOutputHelper outputHelper) + protected SdkTests(ITestOutputHelper outputHelper) : base(outputHelper) { DotNetHelper = new DotNetHelper(outputHelper); - OutputHelper = outputHelper; } } diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs index 9fbbbc781..8ab1a9600 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs @@ -13,13 +13,14 @@ using Xunit.Abstractions; namespace Microsoft.DotNet.SourceBuild.SmokeTests; -public class SourceBuiltArtifactsTests : SmokeTests +public class SourceBuiltArtifactsTests : SdkTests { public SourceBuiltArtifactsTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - [Fact] + [SkippableFact(Config.SourceBuiltArtifactsPathEnv, skipOnNullOrWhiteSpaceEnv: true)] public void VerifyVersionFile() { + Assert.NotNull(Config.SourceBuiltArtifactsPath); string outputDir = Path.Combine(Directory.GetCurrentDirectory(), "sourcebuilt-artifacts"); Directory.CreateDirectory(outputDir); try diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestBase.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestBase.cs new file mode 100644 index 000000000..963f07109 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestBase.cs @@ -0,0 +1,25 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System.IO; +using Xunit.Abstractions; + +namespace Microsoft.DotNet.SourceBuild.SmokeTests; + +public abstract class TestBase +{ + public static string LogsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "logs"); + + public ITestOutputHelper OutputHelper { get; } + + public TestBase(ITestOutputHelper outputHelper) + { + OutputHelper = outputHelper; + + if (!Directory.Exists(LogsDirectory)) + { + Directory.CreateDirectory(LogsDirectory); + } + } +} diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs index ba5150bf5..8011d6f74 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; using System.Formats.Tar; using System.IO; using System.IO.Compression; +using System.IO.Enumeration; using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -18,6 +19,37 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; public static class Utilities { + /// + /// Returns whether the given file path is excluded by the given exclusions using glob file matching. + /// + public static bool IsFileExcluded(string filePath, IEnumerable exclusions) => + GetMatchingFileExclusions(filePath, exclusions, exclusion => exclusion).Any(); + + public static IEnumerable GetMatchingFileExclusions(string filePath, IEnumerable exclusions, Func getExclusionExpression) => + exclusions.Where(exclusion => FileSystemName.MatchesSimpleExpression(getExclusionExpression(exclusion), filePath)); + + /// + /// Parses a common file format in the test suite for listing file exclusions. + /// + /// Name of the exclusions file. + /// When specified, filters the exclusions to those that begin with the prefix value. + public static IEnumerable ParseExclusionsFile(string exclusionsFileName, string? prefix = null) + { + string exclusionsFilePath = Path.Combine(BaselineHelper.GetAssetsDirectory(), exclusionsFileName); + int prefixSkip = prefix?.Length + 1 ?? 0; + return File.ReadAllLines(exclusionsFilePath) + // process only specific exclusions if a prefix is provided + .Where(line => prefix is null || line.StartsWith(prefix + ",")) + .Select(line => + { + // Ignore comments + var index = line.IndexOf('#'); + return index >= 0 ? line[prefixSkip..index].TrimEnd() : line[prefixSkip..]; + }) + .Where(line => !string.IsNullOrEmpty(line)) + .ToList(); + } + public static void ExtractTarball(string tarballPath, string outputDir, ITestOutputHelper outputHelper) { // TarFile doesn't properly handle hard links (https://github.com/dotnet/runtime/pull/85378#discussion_r1221817490), diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs index 248901530..2ee7fa1dd 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs @@ -16,7 +16,7 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; /// for related basic scenarios. /// They are encapsulated in a separate testclass so that they can be run in parallel. /// -public class WebScenarioTests : SmokeTests +public class WebScenarioTests : SdkTests { public WebScenarioTests(ITestOutputHelper outputHelper) : base(outputHelper) { } diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt new file mode 100644 index 000000000..e0efc77dd --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt @@ -0,0 +1,257 @@ +# Contains the list of files to be excluded from license scanning. +# +# This list is processed using FileSystemName.MatchesSimpleExpression +# +# Format: +# Exclude the file entirely from license scanning: +# +# Exclude a specific detected license expression from the scan results for the file: +# |[,...] + +# +# arcade +# + +# False positive +src/arcade/Documentation/UnifiedBuild/Foundational-Concepts.md +src/arcade/src/Microsoft.DotNet.Build.Tasks.Installers/src/BuildFPMToolPreReqs.cs|json +src/arcade/src/Microsoft.DotNet.Build.Tasks.Installers/build/rpm_templates/copyright|cecill-c +src/arcade/src/SignCheck/SignCheck/THIRD-PARTY-NOTICES.TXT + +# Doesn't apply to code +src/arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Licenses/* + +# Applies to installer, not source +src/arcade/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/eula.rtf + +# +# aspnetcore +# + +# Line 1 is a generic statement about license applicability that is being detected as "unknown" +src/aspnetcore/src/Components/THIRD-PARTY-NOTICES.txt|unknown + +# Windows installer files that have a reference to a URL for license +src/aspnetcore/src/Installers/Windows/**/*.wxl|unknown-license-reference +src/aspnetcore/src/Installers/Windows/**/*.wxs|unknown-license-reference + +# License reference used in configuration, but not applying to code +src/aspnetcore/src/Mvc/Settings.StyleCop|unknown-license-reference +src/aspnetcore/src/submodules/MessagePack-CSharp/stylecop.json|unknown + +# +# command-line-api +# + +# False positive +src/command-line-api/System.CommandLine.sln|json + +# +# deployment-tools +# + +# False positive +src/deployment-tools/THIRD-PARTY-NOTICES.TXT|unknown-license-reference + +# +# diagnostics +# + +# False positive +src/diagnostics/THIRD-PARTY-NOTICES.TXT|codesourcery-2004 + +# +# format +# + +# False positive +src/format/THIRD-PARTY-NOTICES.TXT|unknown-license-reference + +# +# fsharp +# + +# False positive +src/fsharp/tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs|unknown-license-reference +src/fsharp/tests/service/data/TestTP/ProvidedTypes.fs|unknown-license-reference +src/fsharp/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/ProvidedTypes.fs|unknown-license-reference + +# Applies to installer, not source +src/fsharp/setup/resources/eula/*.rtf + +# +# installer +# + +# False positive +src/installer/src/core-sdk-tasks/BuildFPMToolPreReqs.cs|json +src/installer/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html|cecill-c +src/installer/THIRD-PARTY-NOTICES|proprietary-license + +# Configuration, doesn't apply to source directly +src/installer/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt +src/installer/src/redist/targets/packaging/**/*.json + +# +# msbuild +# + +# License reference used in build configuration, but not applying to code +src/msbuild/src/Directory.Build.props|ms-net-library-2018-11 + +# False positive +src/msbuild/src/Build/Instance/ProjectItemInstance.cs|generic-exception + +# +# nuget-client +# + +# False positive +src/nuget-client/build/NOTICES.txt|other-copyleft +src/nuget-client/README.md|unknown-license-reference +src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources.Designer.cs|unknown-license-reference +src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/Actions/UIActionEngine.cs|unknown-license-reference +src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Services/NuGetPackageFileService.cs|proprietary-license +src/nuget-client/src/NuGet.Clients/NuGet.VisualStudio.Internal.Contracts/Formatters/LicenseMetadataFormatter.cs|proprietary-license +src/nuget-client/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/LicenseMetadata.cs|unknown-license-reference +src/nuget-client/src/NuGet.Core/NuGet.Packaging/Rules/DefaultManifestValuesRule.cs|unknown-license-reference +src/nuget-client/test/TestExtensions/GenerateLicenseList/Program.cs|json + +# Test data +src/nuget-client/test/**/resources/*.json +src/nuget-client/test/**/resources/*.xml +src/nuget-client/test/NuGet.Clients.Tests/NuGet.PackageManagement.UI.Test/PackageLicenseUtilitiesTests.cs +src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/DefaultManifestValuesRuleTests.cs +src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/LicenseExpressionTokenizerTests.cs +src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/NuGetLicenseExpressionParserTests.cs +src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/NuGetLicenseTests.cs +src/nuget-client/test/TestUtilities/Test.Utility/JsonData.cs + +# +# roslyn-analyzers +# + +# Build asset, not applicable to source +src/roslyn-analyzers/assets/EULA.txt|ms-net-library + +# +# roslyn +# + +# Test data +src/roslyn/src/Analyzers/VisualBasic/Tests/FileHeaders/FileHeaderTests.vb|unknown-license-reference +src/roslyn/src/EditorFeatures/CSharpTest2/EmbeddedLanguages/RegularExpressions/Regex_RealWorldPatterns.json + +# False positive +src/roslyn/src/Compilers/**/Portable/Symbols/NonMissingModuleSymbol.*|proprietary-license +src/roslyn/src/NuGet/ThirdPartyNotices.rtf|json + +# Applicable to installer, not source +src/roslyn/src/Setup/Roslyn.ThirdPartyNotices/ThirdPartyNotices.rtf +src/roslyn/src/Setup/Roslyn.VsixLicense/EULA.rtf + +# +# runtime +# + +# Doc describing licenses, not applicable to source +src/runtime/docs/project/copyright.md +src/runtime/docs/project/glossary.md + +# Doc that references a license, not applicable to source +src/runtime/src/coreclr/nativeaot/docs/compiling.md|openssl-ssleay + +# Installer asset, not applicable to source +src/runtime/src/installer/pkg/LICENSE-MSFT.TXT +src/runtime/src/installer/pkg/THIRD-PARTY-NOTICES.TXT + +# False positive +src/runtime/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/LicFileLicenseProvider.cs|proprietary-license +src/runtime/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/LongValidatorTest.cs|json +src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/Connect.cs|other-permissive +src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/UdpClientTest.cs|other-permissive +src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive/SendReceive.cs|other-permissive +src/runtime/src/libraries/System.Reflection.Metadata/tests/Resources/README.md|unknown-license-reference +src/runtime/src/libraries/System.Runtime/tests/TestModule/README.md|unknown-license-reference +src/runtime/src/libraries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlLicenseTransform.cs|proprietary-license +src/runtime/src/libraries/System.ServiceModel.Syndication/tests/BasicScenarioTests.cs|unknown-license-reference +src/runtime/src/mono/mono/mini/mini-posix.c|unknown-license-reference +src/runtime/src/mono/mono/mini/mini-windows.c|unknown-license-reference +src/runtime/src/native/external/libunwind/doc/libunwind-ia64.*|generic-exception +src/runtime/src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.cs|unknown-license-reference + +# Test data +src/runtime/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/InputSpace.cs|other-permissive +src/runtime/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/THIRD-PARTY-NOTICE|other-permissive +src/runtime/src/libraries/System.ServiceModel.Syndication/tests/TestFeeds/AtomFeeds/*.xml +src/runtime/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/AttRegexTests.cs|other-permissive + +# Reference to a license, not applicable to source +src/runtime/src/libraries/System.Text.Json/roadmap/images/core-components.txt|unknown-license-reference +src/runtime/src/libraries/System.Text.Json/roadmap/images/higher-level-components.txt + +# Sample data +src/runtime/src/mono/sample/wasm/browser-webpack/package-lock.json + +# +# source-build-externals +# + +# False positive +src/source-build-externals/src/abstractions-xunit/README.md|free-unknown +src/source-build-externals/src/application-insights/NETCORE/ThirdPartyNotices.txt|unknown +src/source-build-externals/src/azure-activedirectory-identitymodel-extensions-for-dotnet/benchmark/Microsoft.IdentityModel.Benchmarks/CreateTokenTests.cs|proprietary-license +src/source-build-externals/src/azure-activedirectory-identitymodel-extensions-for-dotnet/src/Microsoft.IdentityModel.JsonWebTokens/JsonClaimValueTypes.cs|proprietary-license +src/source-build-externals/src/azure-activedirectory-identitymodel-extensions-for-dotnet/src/Microsoft.IdentityModel.Tokens.Saml/Saml/ClaimProperties.cs|proprietary-license +src/source-build-externals/src/azure-activedirectory-identitymodel-extensions-for-dotnet/src/Microsoft.IdentityModel.Tokens.Saml/Saml/SamlTokenUtilities.cs|proprietary-license +src/source-build-externals/src/azure-activedirectory-identitymodel-extensions-for-dotnet/src/Microsoft.IdentityModel.Tokens.Saml/Saml2/ClaimProperties.cs|proprietary-license +src/source-build-externals/src/azure-activedirectory-identitymodel-extensions-for-dotnet/src/System.IdentityModel.Tokens.Jwt/JsonClaimValueTypes.cs|proprietary-license +src/source-build-externals/src/humanizer/readme.md|free-unknown +src/source-build-externals/src/humanizer/NuSpecs/*.nuspec* +src/source-build-externals/src/xunit/README.md|free-unknown +src/source-build-externals/src/xunit/src/xunit.assert/Asserts/README.md|free-unknown +src/source-build-externals/src/xunit/xunit.sln|json + +# A patch which removes the license usage but contains references to the removed license as part of the patch reference lines +src/source-build-externals/patches/application-insights/0002-Remove-WebGrease-from-TPN-2816.patch + +# +# source-build-reference-packages +# + +# False positive +src/source-build-reference-packages/src/targetPacks/ILsrc/microsoft.netcore.app.ref/3.*/THIRD-PARTY-NOTICES.TXT|codesourcery-2004 +src/source-build-reference-packages/src/targetPacks/ILsrc/netstandard.library/1.6.1/ThirdPartyNotices.txt|unknown +src/source-build-reference-packages/src/targetPacks/ILsrc/netstandard.library/2.0.*/THIRD-PARTY-NOTICES.TXT|unknown +src/source-build-reference-packages/src/targetPacks/ILsrc/netstandard.library.ref/2.1.0/THIRD-PARTY-NOTICES.TXT|codesourcery-2004 +src/source-build-reference-packages/src/textOnlyPackages/src/microsoft.codeanalysis.collections/4.2.0-1.22102.8/ThirdPartyNotices.rtf|json +src/source-build-reference-packages/src/textOnlyPackages/src/microsoft.netcore.*/1.*/ThirdPartyNotices.txt|unknown + +# Contains references to licenses which are not applicable to the source +src/source-build-reference-packages/src/packageSourceGenerator/PackageSourceGeneratorTask/RewriteNuspec.cs|unknown-license-reference,ms-net-library-2018-11 +src/source-build-reference-packages/src/textOnlyPackages/src/microsoft.private.intellisense/8.0.0-preview-20230918.1/IntellisenseFiles/windowsdesktop/1033/PresentationCore.xml|proprietary-license + +# +# sourcelink +# + +# False positive +src/sourcelink/docs/GitSpec/GitSpec.md|unknown-license-reference + +# +# test-templates +# + +# Not applicable to source +src/test-templates/Templates/**/*.vstemplate + +# +# vstest +# + +# False positive +src/vstest/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcDumpArgsBuilder.cs|proprietary-license + +# Build asset, but not applying to code +src/vstest/src/package/Microsoft.CodeCoverage/ThirdPartyNoticesCodeCoverage.txt +src/vstest/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/License.rtf diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.arcade.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.arcade.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.arcade.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspnetcore.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspnetcore.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspnetcore.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.cecil.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.cecil.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.cecil.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.command-line-api.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.command-line-api.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.command-line-api.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.deployment-tools.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.deployment-tools.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.deployment-tools.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.diagnostics.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.diagnostics.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.diagnostics.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.emsdk.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.emsdk.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.emsdk.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.format.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.format.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.format.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.fsharp.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.fsharp.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.fsharp.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.installer.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.installer.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.installer.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.msbuild.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.msbuild.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.msbuild.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.nuget-client.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.nuget-client.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.nuget-client.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.razor.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.razor.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.razor.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.roslyn-analyzers.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.roslyn-analyzers.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.roslyn-analyzers.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.roslyn.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.roslyn.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.roslyn.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.runtime.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.runtime.json new file mode 100644 index 000000000..472899b4c --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.runtime.json @@ -0,0 +1,20 @@ +{ + "files": [ + { + "path": "src/tests/GC/Scenarios/GCBench/THIRD-PARTY-NOTICES", + "detected_license_expression": "unknown-license-reference" + }, + { + "path": "src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/THIRD-PARTY-NOTICES", + "detected_license_expression": "unknown-license-reference" + }, + { + "path": "src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDLLoops/THIRD-PARTY-NOTICES", + "detected_license_expression": "unknown-license-reference" + }, + { + "path": "src/tests/JIT/Performance/CodeQuality/V8/Richards/THIRD-PARTY-NOTICES", + "detected_license_expression": "unknown-license-reference" + } + ] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.sdk.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.sdk.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.sdk.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.source-build-externals.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.source-build-externals.json new file mode 100644 index 000000000..42c3e6895 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.source-build-externals.json @@ -0,0 +1,12 @@ +{ + "files": [ + { + "path": "src/application-insights/LOGGING/ThirdPartyNotices.txt", + "detected_license_expression": "unknown AND apache-2.0 AND mit AND bsd-new" + }, + { + "path": "src/application-insights/WEB/ThirdPartyNotices.txt", + "detected_license_expression": "bsd-new AND mit AND ms-pl AND apache-2.0 AND (cc-by-3.0-us AND cc-by-3.0 AND mit) AND ms-net-library AND ms-rl" + } + ] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.source-build-reference-packages.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.source-build-reference-packages.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.source-build-reference-packages.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.sourcelink.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.sourcelink.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.sourcelink.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.symreader.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.symreader.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.symreader.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.templating.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.templating.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.templating.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.test-templates.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.test-templates.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.test-templates.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.vstest.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.vstest.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.vstest.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.xdt.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.xdt.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.xdt.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.xliff-tasks.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.xliff-tasks.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.xliff-tasks.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file From 2a1073783012150c02c2e3a4eb2951f640bbde01 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 12 Oct 2023 16:08:32 -0500 Subject: [PATCH 090/109] Add prebuilts for 8.0 P7 ref packs --- src/SourceBuild/content/eng/Versions.props | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index f0e045b07..5eecfd79b 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -32,5 +32,6 @@ --> https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-rc.1.23410.1.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-rc.1.23410.1-centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-9.0.100-1.centos.8-x64.tar.gz From 45551c3d5da01cbeb72fe75e2aa9f97adcf9c708 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 21:47:33 +0000 Subject: [PATCH 091/109] Update dependencies from https://github.com/dotnet/sdk build 20231012.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23477.13 -> To Version 9.0.100-alpha.1.23512.21 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23477.3 (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 8ba5b9574..fc0bb7fcf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 3d83ad986828391652e48ebd037c5f485b4edd26 - + https://github.com/dotnet/sdk - a36f703483fa026d9fc69ccad5ec8c9bd657f19d + fdb372b3219a898aa5f8bb5c135afbfd6b81e8c4 - + https://github.com/dotnet/sdk - a36f703483fa026d9fc69ccad5ec8c9bd657f19d + fdb372b3219a898aa5f8bb5c135afbfd6b81e8c4 - + https://github.com/dotnet/sdk - a36f703483fa026d9fc69ccad5ec8c9bd657f19d + fdb372b3219a898aa5f8bb5c135afbfd6b81e8c4 - + https://github.com/dotnet/sdk - a36f703483fa026d9fc69ccad5ec8c9bd657f19d + fdb372b3219a898aa5f8bb5c135afbfd6b81e8c4 https://github.com/dotnet/test-templates @@ -156,9 +156,9 @@ a9341111228592c25c43ecf6858e7b39e525b5a1 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 5ce332fb834feea1f6c974d17456c8c9d5504e09 diff --git a/eng/Versions.props b/eng/Versions.props index 682b60fe1..ff7a1a6ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,9 @@ - 9.0.100-alpha.1.23512.15 - 9.0.100-alpha.1.23512.15 - 9.0.100-alpha.1.23512.15 + 9.0.100-alpha.1.23512.21 + 9.0.100-alpha.1.23512.21 + 9.0.100-alpha.1.23512.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -126,7 +126,7 @@ - 6.8.0-rc.122 + 6.9.0-preview.1.13 From ff7ef631a1e836850309a7dbbaf6e6ac32b774d9 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 17 Oct 2023 09:55:43 -0500 Subject: [PATCH 092/109] Set install-scancode script to be executable (#17536) --- eng/install-scancode.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 eng/install-scancode.sh diff --git a/eng/install-scancode.sh b/eng/install-scancode.sh old mode 100644 new mode 100755 From c5ce95b250cc405443c5d740841f387215b0e903 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 17 Oct 2023 10:30:57 -0500 Subject: [PATCH 093/109] Update referenced OmniSharp version in SB smoke tests (#17475) --- .../Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs index c604ed94a..11963c194 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs @@ -19,7 +19,7 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; public class OmniSharpTests : SdkTests { // Update version as new releases become available: https://github.com/OmniSharp/omnisharp-roslyn/releases - private const string OmniSharpReleaseVersion = "1.39.8"; + private const string OmniSharpReleaseVersion = "1.39.10"; private string OmniSharpDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "omnisharp"); From 2593c6545468c97a81478ac09f82777d5bdb895f Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 18 Oct 2023 08:29:30 -0500 Subject: [PATCH 094/109] Workaround crossgen dependency on .NET 8 runtime --- src/SourceBuild/content/prep.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SourceBuild/content/prep.sh b/src/SourceBuild/content/prep.sh index 472c348ae..9d53f1bc7 100755 --- a/src/SourceBuild/content/prep.sh +++ b/src/SourceBuild/content/prep.sh @@ -157,6 +157,9 @@ function BootstrapArtifacts { if [ "$installDotnet" == true ]; then echo " Installing dotnet..." (source ./eng/common/tools.sh && InitializeDotNetCli true) + + # TODO: Remove once runtime dependency is gone (https://github.com/dotnet/runtime/issues/93666) + bash .dotnet/dotnet-install.sh --install-dir "$SCRIPT_ROOT/.dotnet" --version 8.0.0-preview.7.23375.6 --runtime dotnet fi # Read the eng/Versions.props to get the archives to download and download them From 791029a13afea85a52a8fc80570c65ae9fc81080 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 18 Oct 2023 08:57:57 -0500 Subject: [PATCH 095/109] Install latest build of .NET 8 runtime --- src/SourceBuild/content/prep.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/prep.sh b/src/SourceBuild/content/prep.sh index 9d53f1bc7..f9e88d6c4 100755 --- a/src/SourceBuild/content/prep.sh +++ b/src/SourceBuild/content/prep.sh @@ -159,7 +159,7 @@ if [ "$installDotnet" == true ]; then (source ./eng/common/tools.sh && InitializeDotNetCli true) # TODO: Remove once runtime dependency is gone (https://github.com/dotnet/runtime/issues/93666) - bash .dotnet/dotnet-install.sh --install-dir "$SCRIPT_ROOT/.dotnet" --version 8.0.0-preview.7.23375.6 --runtime dotnet + bash .dotnet/dotnet-install.sh --install-dir "$SCRIPT_ROOT/.dotnet" --channel 8.0 --runtime dotnet fi # Read the eng/Versions.props to get the archives to download and download them From 5f31c079f2d194bbe4cb41d5ce8506e1b2fad1a2 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 18 Oct 2023 11:03:01 -0500 Subject: [PATCH 096/109] Add razor patch to set net9.0 TFM --- .../0001-Explicitly-set-net9.0-TFM.patch | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch diff --git a/src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch b/src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch new file mode 100644 index 000000000..150d6174f --- /dev/null +++ b/src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Wed, 18 Oct 2023 10:58:11 -0500 +Subject: [PATCH] Explicitly set net9.0 TFM + +https://github.com/dotnet/source-build/issues/3663 +--- + Directory.Build.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Directory.Build.props b/Directory.Build.props +index bf6754f23..d76f449be 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -66,7 +66,7 @@ + --> + + +- $(NetCurrent) ++ net9.0 + $(DefaultNetCoreTargetFramework) + + From d2a2a2ac45c605c43615694c616fc0bea41b1c23 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 18 Oct 2023 13:09:53 -0500 Subject: [PATCH 097/109] Add patches for format repo --- .../0001-Explicitly-set-TFM-to-net9.0.patch | 51 +++++++++++++++++++ ...te-Microsoft.Build.Locator-to-1.6.10.patch | 23 +++++++++ 2 files changed, 74 insertions(+) create mode 100644 src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch create mode 100644 src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch diff --git a/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch b/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch new file mode 100644 index 000000000..2f1cabb2e --- /dev/null +++ b/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch @@ -0,0 +1,51 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Wed, 18 Oct 2023 12:50:21 -0500 +Subject: [PATCH] Explicitly set TFM to net9.0 + +https://github.com/dotnet/source-build/issues/3663 +--- + perf/dotnet-format.Performance.csproj | 2 +- + src/dotnet-format.csproj | 2 +- + tests/dotnet-format.UnitTests.csproj | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/perf/dotnet-format.Performance.csproj b/perf/dotnet-format.Performance.csproj +index 677b7b9a..3e1387d1 100644 +--- a/perf/dotnet-format.Performance.csproj ++++ b/perf/dotnet-format.Performance.csproj +@@ -1,7 +1,7 @@ +  + + +- $(NetCurrent) ++ net9.0 + Exe + true + Release +diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj +index 5549fb71..8a77d03f 100644 +--- a/src/dotnet-format.csproj ++++ b/src/dotnet-format.csproj +@@ -1,7 +1,7 @@ +  + + +- $(NetCurrent) ++ net9.0 + Exe + Microsoft.CodeAnalysis.Tools + true +diff --git a/tests/dotnet-format.UnitTests.csproj b/tests/dotnet-format.UnitTests.csproj +index c4311a1a..5b1bcfb9 100644 +--- a/tests/dotnet-format.UnitTests.csproj ++++ b/tests/dotnet-format.UnitTests.csproj +@@ -1,7 +1,7 @@ +  + + +- $(NetCurrent) ++ net9.0 + Microsoft.CodeAnalysis.Tools.Tests + + diff --git a/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch b/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch new file mode 100644 index 000000000..95a2681b4 --- /dev/null +++ b/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Wed, 18 Oct 2023 13:05:45 -0500 +Subject: [PATCH] Update Microsoft.Build.Locator to 1.6.10 + +https://github.com/dotnet/sdk/issues/36219 +--- + eng/Versions.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index 961660e5..c330813b 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -40,7 +40,7 @@ + + 0.13.5 + 0.13.5 +- 1.5.5 ++ 1.6.10 + 17.4.16 + + From eccf03cdd90a47ad15f119de2e055ff56292acd2 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 18 Oct 2023 13:28:58 -0500 Subject: [PATCH 098/109] Fix bad patch --- .../format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch b/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch index 95a2681b4..82d78b738 100644 --- a/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch +++ b/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch @@ -18,6 +18,6 @@ index 961660e5..c330813b 100644 0.13.5 - 1.5.5 + 1.6.10 - 17.4.16 + 17.4.16 From a1936b357a9e2ba8b4e1036a834a370105f3fee7 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 18 Oct 2023 16:14:46 -0500 Subject: [PATCH 099/109] Include Newtonsoft.Json.13.0.1 prebuilt for arcade --- src/SourceBuild/content/eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 5eecfd79b..2765c58ba 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -32,6 +32,6 @@ --> https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-rc.1.23410.1.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-rc.1.23410.1-centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-9.0.100-1.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-9.0.100-2.centos.8-x64.tar.gz From e88289a426c508f701c37bdcb4da52767d052269 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 19 Oct 2023 09:26:22 -0500 Subject: [PATCH 100/109] Add patches for net9.0 TFM --- .../0001-Explicitly-set-TFM-to-net9.0.patch | 2 +- ...te-Microsoft.Build.Locator-to-1.6.10.patch | 2 +- .../0001-Explicitly-set-net9.0-TFM.patch | 599 ++++++++++++++++++ .../0001-Explicitly-set-net9.0-TFM.patch | 2 +- ...001-Use-net9.0-for-tool-dependencies.patch | 50 ++ .../0001-Explicitly-use-net9.0-TFM.patch | 51 ++ 6 files changed, 703 insertions(+), 3 deletions(-) create mode 100644 src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch create mode 100644 src/SourceBuild/patches/sdk/0001-Use-net9.0-for-tool-dependencies.patch create mode 100644 src/SourceBuild/patches/vstest/0001-Explicitly-use-net9.0-TFM.patch diff --git a/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch b/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch index 2f1cabb2e..ac34d9338 100644 --- a/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch +++ b/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch @@ -3,7 +3,7 @@ From: Matt Thalman Date: Wed, 18 Oct 2023 12:50:21 -0500 Subject: [PATCH] Explicitly set TFM to net9.0 -https://github.com/dotnet/source-build/issues/3663 +Backport: https://github.com/dotnet/source-build/issues/3663 --- perf/dotnet-format.Performance.csproj | 2 +- src/dotnet-format.csproj | 2 +- diff --git a/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch b/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch index 82d78b738..7ce4f5dc2 100644 --- a/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch +++ b/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch @@ -3,7 +3,7 @@ From: Matt Thalman Date: Wed, 18 Oct 2023 13:05:45 -0500 Subject: [PATCH] Update Microsoft.Build.Locator to 1.6.10 -https://github.com/dotnet/sdk/issues/36219 +Backport: https://github.com/dotnet/sdk/issues/36219 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch b/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch new file mode 100644 index 000000000..a3328f6f3 --- /dev/null +++ b/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch @@ -0,0 +1,599 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Thu, 19 Oct 2023 08:33:01 -0500 +Subject: [PATCH] Explicitly use net9.0 TFM + +Backport: https://github.com/dotnet/source-build/issues/3663 +--- + buildtools/AssemblyCheck/AssemblyCheck.fsproj | 2 +- + .../FSharp.Compiler.Service_notshipped.fsproj | 2 +- + buildtools/fslex/fslex.fsproj | 2 +- + buildtools/fsyacc/fsyacc.fsproj | 2 +- + .../EditorService/EditorService.fsproj | 2 +- + src/Compiler/FSharp.Compiler.Service.fsproj | 6 ++-- + .../Microsoft.FSharp.Compiler.fsproj | 2 +- + .../Microsoft.FSharp.Compiler.nuspec | 28 +++++++++---------- + src/fsc/fscProject/fsc.fsproj | 6 ++-- + src/fsi/fsiProject/fsi.fsproj | 6 ++-- + .../SelfContained_Trimming_Test.fsproj | 6 ++-- + ...taticLinkedFSharpCore_Trimming_Test.fsproj | 6 ++-- + .../BasicProvider.DesignTime.fsproj | 2 +- + .../BasicProvider.Tests.fsproj | 2 +- + .../BasicProvider/BasicProvider.fsproj | 2 +- + .../FSharp.Build.UnitTests.fsproj | 4 +-- + .../FSharp.Compiler.ComponentTests.fsproj | 4 +-- + ...ompiler.Private.Scripting.UnitTests.fsproj | 4 +-- + .../FSharp.Compiler.Service.Tests.fsproj | 4 +-- + .../FSharp.Compiler.UnitTests.fsproj | 4 +-- + .../FSharp.Core.UnitTests.fsproj | 4 +-- + .../FSharp.Test.Utilities.fsproj | 4 +-- + .../MicroPerf/MicroPerf.fsproj | 2 +- + .../TaskPerf/TaskPerf/TaskPerf.fsproj | 2 +- + .../TaskPerfPreviousCompiler.fsproj | 2 +- + .../HistoricalBenchmark.Runner.fsproj | 2 +- + .../HistoricalBenchmark.fsproj | 2 +- + .../FSharp.Compiler.Benchmarks.fsproj | 2 +- + .../FCSSourceFiles/FCSSourceFiles.fsproj | 2 +- + .../Fsharp.ProfilingStartpointProject.fsproj | 2 +- + tests/fsharp/FSharpSuite.Tests.fsproj | 4 +-- + .../Sample_ConsoleApp_net7.fsproj | 6 ++-- + .../Sample_ConsoleApp_net7.fsproj | 6 ++-- + 33 files changed, 68 insertions(+), 68 deletions(-) + +diff --git a/buildtools/AssemblyCheck/AssemblyCheck.fsproj b/buildtools/AssemblyCheck/AssemblyCheck.fsproj +index 46ffb722c..9d391689d 100644 +--- a/buildtools/AssemblyCheck/AssemblyCheck.fsproj ++++ b/buildtools/AssemblyCheck/AssemblyCheck.fsproj +@@ -2,7 +2,7 @@ + + + Exe +- net8.0 ++ net9.0 + true + false + +diff --git a/buildtools/checkpackages/FSharp.Compiler.Service_notshipped.fsproj b/buildtools/checkpackages/FSharp.Compiler.Service_notshipped.fsproj +index 514b1f4dd..d3df3b688 100644 +--- a/buildtools/checkpackages/FSharp.Compiler.Service_notshipped.fsproj ++++ b/buildtools/checkpackages/FSharp.Compiler.Service_notshipped.fsproj +@@ -3,7 +3,7 @@ + + + +- net8.0 ++ net9.0 + true + $(MSBuildProjectDirectory)\..\..\artifacts\tmp\$([System.Guid]::NewGuid()) + $(CachePath)\bin +diff --git a/buildtools/fslex/fslex.fsproj b/buildtools/fslex/fslex.fsproj +index 674dde7c7..8764e40e1 100644 +--- a/buildtools/fslex/fslex.fsproj ++++ b/buildtools/fslex/fslex.fsproj +@@ -2,7 +2,7 @@ + + + Exe +- net8.0 ++ net9.0 + true + false + LatestMajor +diff --git a/buildtools/fsyacc/fsyacc.fsproj b/buildtools/fsyacc/fsyacc.fsproj +index fc072b7cf..4110186e5 100644 +--- a/buildtools/fsyacc/fsyacc.fsproj ++++ b/buildtools/fsyacc/fsyacc.fsproj +@@ -2,7 +2,7 @@ + + + Exe +- net8.0 ++ net9.0 + true + false + LatestMajor +diff --git a/fcs-samples/EditorService/EditorService.fsproj b/fcs-samples/EditorService/EditorService.fsproj +index e4103999f..fe08d0cc4 100644 +--- a/fcs-samples/EditorService/EditorService.fsproj ++++ b/fcs-samples/EditorService/EditorService.fsproj +@@ -1,7 +1,7 @@ +  + + +- $(FcsTargetNetFxFramework);net8.0 ++ $(FcsTargetNetFxFramework);net9.0 + true + Exe + false +diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj +index 45ae22a3e..56a587c30 100644 +--- a/src/Compiler/FSharp.Compiler.Service.fsproj ++++ b/src/Compiler/FSharp.Compiler.Service.fsproj +@@ -521,15 +521,15 @@ + + + +- TargetFramework=net8.0 ++ TargetFramework=net9.0 + compile + + +- TargetFramework=net8.0 ++ TargetFramework=net9.0 + compile + + +- TargetFramework=net8.0 ++ TargetFramework=net9.0 + compile + + +diff --git a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj +index f7560b707..68b02ce25 100644 +--- a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj ++++ b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj +@@ -3,7 +3,7 @@ + + true + Exe +- net8.0 ++ net9.0 + Microsoft.FSharp.Compiler.nuspec + true + .NET Core compatible version of the F# compiler fsc.exe. +diff --git a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec +index ca36309d5..e567e478b 100644 +--- a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec ++++ b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec +@@ -4,7 +4,7 @@ + $CommonMetadataElements$ + en-US + +- ++ + + + +@@ -26,16 +26,16 @@ + this approach gives a very small deployment. Which is kind of necessary. + --> + +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ + ++ target="lib\net9.0" /> + ++ target="lib\net9.0" /> + + + +@@ -45,14 +45,14 @@ + + + +- ++ + ++ target="lib\net9.0" /> + +- ++ target="lib\net9.0" /> ++ + ++ target="lib\net9.0" /> + + +diff --git a/src/fsc/fscProject/fsc.fsproj b/src/fsc/fscProject/fsc.fsproj +index 64c4651a7..985f1492b 100644 +--- a/src/fsc/fscProject/fsc.fsproj ++++ b/src/fsc/fscProject/fsc.fsproj +@@ -3,15 +3,15 @@ + + + +- net472;net8.0 +- net8.0 ++ net472;net9.0 ++ net9.0 + x86 + Debug;Release;Proto;ReleaseCompressed + + + + net472 +- net8.0 ++ net9.0 + x86 + + +diff --git a/src/fsi/fsiProject/fsi.fsproj b/src/fsi/fsiProject/fsi.fsproj +index dd17f8bd5..6bfa01c3e 100644 +--- a/src/fsi/fsiProject/fsi.fsproj ++++ b/src/fsi/fsiProject/fsi.fsproj +@@ -3,15 +3,15 @@ + + + +- net472;net8.0 +- net8.0 ++ net472;net9.0 ++ net9.0 + x86 + Debug;Release;Proto;ReleaseCompressed + + + + net472 +- net8.0 ++ net9.0 + x86 + + +diff --git a/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj b/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj +index cb02b7e0f..acd4e8f10 100644 +--- a/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj ++++ b/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj +@@ -2,7 +2,7 @@ + + + Exe +- net8.0 ++ net9.0 + preview + true + true +@@ -17,8 +17,8 @@ + + + +- $(MSBuildThisFileDirectory)../../../../artifacts/bin/fsc/Release/net8.0/fsc.dll +- $(MSBuildThisFileDirectory)../../../../artifacts/bin/fsc/Release/net8.0/fsc.dll ++ $(MSBuildThisFileDirectory)../../../../artifacts/bin/fsc/Release/net9.0/fsc.dll ++ $(MSBuildThisFileDirectory)../../../../artifacts/bin/fsc/Release/net9.0/fsc.dll + False + True + +diff --git a/tests/AheadOfTime/Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj b/tests/AheadOfTime/Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj +index d36faf2c0..2004fafbe 100644 +--- a/tests/AheadOfTime/Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj ++++ b/tests/AheadOfTime/Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj +@@ -2,7 +2,7 @@ + + + Exe +- net8.0 ++ net9.0 + preview + true + true +@@ -19,8 +19,8 @@ + + + +- $(MSBuildThisFileDirectory)../../../../artifacts/bin/fsc/Release/net8.0/fsc.dll +- $(MSBuildThisFileDirectory)../../../../artifacts/bin/fsc/Release/net8.0/fsc.dll ++ $(MSBuildThisFileDirectory)../../../../artifacts/bin/fsc/Release/net9.0/fsc.dll ++ $(MSBuildThisFileDirectory)../../../../artifacts/bin/fsc/Release/net9.0/fsc.dll + False + True + +diff --git a/tests/EndToEndBuildTests/BasicProvider/BasicProvider.DesignTime/BasicProvider.DesignTime.fsproj b/tests/EndToEndBuildTests/BasicProvider/BasicProvider.DesignTime/BasicProvider.DesignTime.fsproj +index b05e1882f..53c32b81b 100644 +--- a/tests/EndToEndBuildTests/BasicProvider/BasicProvider.DesignTime/BasicProvider.DesignTime.fsproj ++++ b/tests/EndToEndBuildTests/BasicProvider/BasicProvider.DesignTime/BasicProvider.DesignTime.fsproj +@@ -2,7 +2,7 @@ + + + Library +- net8.0;net472 ++ net9.0;net472 + typeproviders + NO_GENERATIVE + IS_DESIGNTIME +diff --git a/tests/EndToEndBuildTests/BasicProvider/BasicProvider.Tests/BasicProvider.Tests.fsproj b/tests/EndToEndBuildTests/BasicProvider/BasicProvider.Tests/BasicProvider.Tests.fsproj +index 5da0cbb3b..981441310 100644 +--- a/tests/EndToEndBuildTests/BasicProvider/BasicProvider.Tests/BasicProvider.Tests.fsproj ++++ b/tests/EndToEndBuildTests/BasicProvider/BasicProvider.Tests/BasicProvider.Tests.fsproj +@@ -2,7 +2,7 @@ + + + Library +- net8.0 ++ net9.0 + $(TestTargetFramework) + false + NO_GENERATIVE +diff --git a/tests/EndToEndBuildTests/BasicProvider/BasicProvider/BasicProvider.fsproj b/tests/EndToEndBuildTests/BasicProvider/BasicProvider/BasicProvider.fsproj +index 96006f066..24c2188c5 100644 +--- a/tests/EndToEndBuildTests/BasicProvider/BasicProvider/BasicProvider.fsproj ++++ b/tests/EndToEndBuildTests/BasicProvider/BasicProvider/BasicProvider.fsproj +@@ -2,7 +2,7 @@ + + + Library +- net8.0;net472 ++ net9.0;net472 + typeproviders + $(FSharpCoreShippedPackageVersionValue) + typeproviders +diff --git a/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj b/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj +index e3c796d0b..e4926cd6c 100644 +--- a/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj ++++ b/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj +@@ -3,8 +3,8 @@ + + + +- net472;net8.0 +- net8.0 ++ net472;net9.0 ++ net9.0 + Library + true + xunit +diff --git a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj +index aefeb44cc..1d07c4d06 100644 +--- a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj ++++ b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj +@@ -3,8 +3,8 @@ + + + +- net472;net8.0 +- net8.0 ++ net472;net9.0 ++ net9.0 + Library + false + true +diff --git a/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj b/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj +index cdfd467e5..2fdcffc90 100644 +--- a/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj ++++ b/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj +@@ -2,8 +2,8 @@ + + + +- net472;net8.0 +- net8.0 ++ net472;net9.0 ++ net9.0 + Library + true + xunit +diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj +index 7cb2dfd22..1fa999721 100644 +--- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj ++++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj +@@ -3,8 +3,8 @@ + + + Exe +- net472;net8.0 +- net8.0 ++ net472;net9.0 ++ net9.0 + + + +- $(NetCurrent) ++ net9.0 + + $(NetCurrent) + +diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj +index a93852ce..945b1ac2 100644 +--- a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj ++++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj +@@ -12,7 +12,7 @@ + + + +- $(NetCurrent) ++ net9.0 + + + +diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj +index b8f6849b..b56b993c 100644 +--- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj ++++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj +@@ -31,7 +31,7 @@ + + + +- ++ + + + From cfc4c38e0d0eb50914cab983b7d85b4352d74f29 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 19 Oct 2023 09:26:34 -0500 Subject: [PATCH 101/109] Prebuilts update --- src/SourceBuild/content/eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 2765c58ba..441357a9f 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -32,6 +32,6 @@ --> https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-rc.1.23410.1.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-rc.1.23410.1-centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-9.0.100-2.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-9.0.100-3.centos.8-x64.tar.gz From 8540a0107edf76142a6dc4ce88e85ec93c7b47f0 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 19 Oct 2023 10:29:41 -0500 Subject: [PATCH 102/109] Update fsharp patch --- .../0001-Explicitly-set-net9.0-TFM.patch | 43 ++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch b/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch index a3328f6f3..a00a05403 100644 --- a/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch +++ b/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch @@ -5,10 +5,12 @@ Subject: [PATCH] Explicitly use net9.0 TFM Backport: https://github.com/dotnet/source-build/issues/3663 --- + Directory.Build.props | 4 +-- buildtools/AssemblyCheck/AssemblyCheck.fsproj | 2 +- .../FSharp.Compiler.Service_notshipped.fsproj | 2 +- buildtools/fslex/fslex.fsproj | 2 +- buildtools/fsyacc/fsyacc.fsproj | 2 +- + eng/build.sh | 6 ++-- .../EditorService/EditorService.fsproj | 2 +- src/Compiler/FSharp.Compiler.Service.fsproj | 6 ++-- .../Microsoft.FSharp.Compiler.fsproj | 2 +- @@ -38,8 +40,23 @@ Backport: https://github.com/dotnet/source-build/issues/3663 tests/fsharp/FSharpSuite.Tests.fsproj | 4 +-- .../Sample_ConsoleApp_net7.fsproj | 6 ++-- .../Sample_ConsoleApp_net7.fsproj | 6 ++-- - 33 files changed, 68 insertions(+), 68 deletions(-) + 35 files changed, 73 insertions(+), 73 deletions(-) +diff --git a/Directory.Build.props b/Directory.Build.props +index 879bd8941..161d115ad 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -30,8 +30,8 @@ + $(MSBuildThisFileDirectory)artifacts/ + $(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/ + $(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/ +- $(ArtifactsDir)/bin/fslex/$(Configuration)/net8.0/fslex.dll +- $(ArtifactsDir)/bin/fsyacc/$(Configuration)/net8.0/fsyacc.dll ++ $(ArtifactsDir)/bin/fslex/$(Configuration)/net9.0/fslex.dll ++ $(ArtifactsDir)/bin/fsyacc/$(Configuration)/net9.0/fsyacc.dll + + + diff --git a/buildtools/AssemblyCheck/AssemblyCheck.fsproj b/buildtools/AssemblyCheck/AssemblyCheck.fsproj index 46ffb722c..9d391689d 100644 --- a/buildtools/AssemblyCheck/AssemblyCheck.fsproj @@ -92,6 +109,30 @@ index fc072b7cf..4110186e5 100644 true false LatestMajor +diff --git a/eng/build.sh b/eng/build.sh +index 3b992d6bf..3a4444081 100755 +--- a/eng/build.sh ++++ b/eng/build.sh +@@ -264,8 +264,8 @@ function BuildSolution { + MSBuild "$repo_root/buildtools/buildtools.proj" /restore "$bltools" /p:Configuration=$bootstrap_config + + mkdir -p "$bootstrap_dir" +- cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net8.0 $bootstrap_dir/fslex +- cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net8.0 $bootstrap_dir/fsyacc ++ cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net9.0 $bootstrap_dir/fslex ++ cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net9.0 $bootstrap_dir/fsyacc + fi + if [ ! -f "$bootstrap_dir/fsc.exe" ]; then + local bltools="" +@@ -274,7 +274,7 @@ function BuildSolution { + fi + BuildMessage="Error building bootstrap" + MSBuild "$repo_root/Proto.sln" /restore "$bltools" /p:Configuration=$bootstrap_config +- cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net8.0 $bootstrap_dir/fsc ++ cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net9.0 $bootstrap_dir/fsc + fi + fi + diff --git a/fcs-samples/EditorService/EditorService.fsproj b/fcs-samples/EditorService/EditorService.fsproj index e4103999f..fe08d0cc4 100644 --- a/fcs-samples/EditorService/EditorService.fsproj From c27abab2e50ce1ca5c109a53d628007ee5a49c0c Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 19 Oct 2023 10:48:49 -0500 Subject: [PATCH 103/109] Disable source build for PR and CI on non-1xx branches (#17578) --- eng/pipelines/vmr-build.yml | 4 ++++ eng/pipelines/vmr-sync-internal.yml | 4 ++++ src/SourceBuild/content/eng/pipelines/ci.yml | 7 +++++++ 3 files changed, 15 insertions(+) diff --git a/eng/pipelines/vmr-build.yml b/eng/pipelines/vmr-build.yml index a675aed38..e6a827a51 100644 --- a/eng/pipelines/vmr-build.yml +++ b/eng/pipelines/vmr-build.yml @@ -4,6 +4,10 @@ pr: include: - main - release/* + exclude: + - release/*.0.2xx + - release/*.0.3xx + - release/*.0.4xx parameters: - name: vmrBranch diff --git a/eng/pipelines/vmr-sync-internal.yml b/eng/pipelines/vmr-sync-internal.yml index 176f98910..0a10a518e 100644 --- a/eng/pipelines/vmr-sync-internal.yml +++ b/eng/pipelines/vmr-sync-internal.yml @@ -5,6 +5,10 @@ trigger: branches: include: - internal/release/* + exclude: + - internal/release/*.0.2xx + - internal/release/*.0.3xx + - internal/release/*.0.4xx resources: repositories: diff --git a/src/SourceBuild/content/eng/pipelines/ci.yml b/src/SourceBuild/content/eng/pipelines/ci.yml index 55b6a212d..be751b083 100644 --- a/src/SourceBuild/content/eng/pipelines/ci.yml +++ b/src/SourceBuild/content/eng/pipelines/ci.yml @@ -7,6 +7,13 @@ trigger: - main - release/* - internal/release/* + exclude: + - release/*.0.2xx + - release/*.0.3xx + - release/*.0.4xx + - internal/release/*.0.2xx + - internal/release/*.0.3xx + - internal/release/*.0.4xx pr: branches: From 4e3e6d972f717d130710fdd9b209cbee0653057f Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 19 Oct 2023 11:53:05 -0500 Subject: [PATCH 104/109] Disable error on prebuilts --- src/SourceBuild/content/build.proj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/SourceBuild/content/build.proj b/src/SourceBuild/content/build.proj index c132475da..0821b98b7 100644 --- a/src/SourceBuild/content/build.proj +++ b/src/SourceBuild/content/build.proj @@ -7,6 +7,10 @@ + + true + + From 8ad57c55bbb1dde1fab5ab0e4c2f4496eedb9071 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 19 Oct 2023 11:53:14 -0500 Subject: [PATCH 105/109] Disable source build tests --- .../ArtifactsSizeTest.cs | 7 +++--- .../BasicScenarioTests.cs | 5 ++-- .../DebugTests.cs | 3 ++- .../DotNetWatchTests.cs | 3 ++- .../OmniSharpTests.cs | 25 ++++++++++--------- .../WebScenarioTests.cs | 5 ++-- 6 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs index ab60beb00..52517ca1f 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs @@ -16,7 +16,7 @@ using Xunit.Abstractions; namespace Microsoft.DotNet.SourceBuild.SmokeTests; [Trait("Category", "SdkContent")] -public class ArtifactsSizeTest : SmokeTests +public class ArtifactsSizeTest : SdkTests { private const int SizeThresholdPercentage = 25; private static readonly string BaselineFilePath = BaselineHelper.GetBaselineFilePath($"ArtifactsSizes/{Config.TargetRid}.txt"); @@ -41,7 +41,8 @@ public class ArtifactsSizeTest : SmokeTests } - [SkippableFact(Config.IncludeArtifactsSizeEnv, skipOnFalseEnv: true)] + // https://github.com/dotnet/source-build/issues/3668 + //[SkippableFact(Config.IncludeArtifactsSizeEnv, skipOnFalseEnv: true)] public void CompareArtifactsToBaseline() { Utilities.ValidateNotNullOrWhiteSpace(Config.SourceBuiltArtifactsPath, Config.SourceBuiltArtifactsPathEnv); @@ -64,7 +65,7 @@ public class ArtifactsSizeTest : SmokeTests try { - string actualFilePath = Path.Combine(DotNetHelper.LogsDirectory, $"UpdatedArtifactsSizes_{Config.TargetRid}.txt"); + string actualFilePath = Path.Combine(LogsDirectory, $"UpdatedArtifactsSizes_{Config.TargetRid}.txt"); File.WriteAllLines(actualFilePath, tarEntries.Select(entry => $"{entry.FilePath}: {entry.Bytes}")); } catch (IOException ex) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs index 493898ab8..fd5416cc9 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs @@ -19,8 +19,9 @@ public class BasicScenarioTests : SdkTests { public BasicScenarioTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - [Theory] - [MemberData(nameof(GetScenarioObjects))] + // https://github.com/dotnet/source-build/issues/3668 + // [Theory] + // [MemberData(nameof(GetScenarioObjects))] public void VerifyScenario(TestScenario scenario) => scenario.Execute(DotNetHelper); public static IEnumerable GetScenarioObjects() => GetScenarios().Select(scenario => new object[] { scenario }); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DebugTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DebugTests.cs index c556b0e90..1876bf20f 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DebugTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DebugTests.cs @@ -21,7 +21,8 @@ public class DebugTests : SdkTests /// /// Verifies that all generated native files include native debug symbols. /// - [Fact] + // https://github.com/dotnet/source-build/issues/3668 + //[Fact] public void SourceBuiltSdkContainsNativeDebugSymbols() { diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs index 8594c67d2..4983ddc72 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs @@ -13,7 +13,8 @@ public class DotNetWatchTests : SdkTests { public DotNetWatchTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - [Fact] + // https://github.com/dotnet/source-build/issues/3668 + //[Fact] public void WatchTests() { string projectDirectory = DotNetHelper.ExecuteNew(DotNetTemplate.Console.GetName(), nameof(DotNetWatchTests)); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs index 11963c194..30a6c486a 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs @@ -25,18 +25,19 @@ public class OmniSharpTests : SdkTests public OmniSharpTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - [SkippableTheory(Config.ExcludeOmniSharpEnv, skipOnTrueEnv: true, skipArchitectures: new[] { "ppc64le", "s390x" })] - [InlineData(DotNetTemplate.BlazorWasm)] - [InlineData(DotNetTemplate.ClassLib)] - [InlineData(DotNetTemplate.Console)] - [InlineData(DotNetTemplate.MSTest)] - [InlineData(DotNetTemplate.Mvc)] - [InlineData(DotNetTemplate.NUnit)] - [InlineData(DotNetTemplate.Web)] - [InlineData(DotNetTemplate.WebApp)] - [InlineData(DotNetTemplate.WebApi)] - [InlineData(DotNetTemplate.Worker)] - [InlineData(DotNetTemplate.XUnit)] + // https://github.com/dotnet/source-build/issues/3668 + // [SkippableTheory(Config.ExcludeOmniSharpEnv, skipOnTrueEnv: true, skipArchitectures: new[] { "ppc64le", "s390x" })] + // [InlineData(DotNetTemplate.BlazorWasm)] + // [InlineData(DotNetTemplate.ClassLib)] + // [InlineData(DotNetTemplate.Console)] + // [InlineData(DotNetTemplate.MSTest)] + // [InlineData(DotNetTemplate.Mvc)] + // [InlineData(DotNetTemplate.NUnit)] + // [InlineData(DotNetTemplate.Web)] + // [InlineData(DotNetTemplate.WebApp)] + // [InlineData(DotNetTemplate.WebApi)] + // [InlineData(DotNetTemplate.Worker)] + // [InlineData(DotNetTemplate.XUnit)] public async void VerifyScenario(DotNetTemplate template) { await InitializeOmniSharp(); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs index 2ee7fa1dd..866a7f9ca 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs @@ -20,8 +20,9 @@ public class WebScenarioTests : SdkTests { public WebScenarioTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - [Theory] - [MemberData(nameof(GetScenarioObjects))] + // https://github.com/dotnet/source-build/issues/3668 + // [Theory] + // [MemberData(nameof(GetScenarioObjects))] public void VerifyScenario(TestScenario scenario) => scenario.Execute(DotNetHelper); public static IEnumerable GetScenarioObjects() => GetScenarios().Select(scenario => new object[] { scenario }); From 45d657db69e9b4ce83c806e9b3f9b5a181c909a9 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 19 Oct 2023 12:56:00 -0500 Subject: [PATCH 106/109] Disable tests --- .../LicenseScanTests.cs | 3 ++- .../Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs | 5 +++-- .../SdkContentTests.cs | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs index 6ddf668c5..46efa0420 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs @@ -136,7 +136,8 @@ public class LicenseScanTests : TestBase _targetRepo = new DirectoryInfo(Config.LicenseScanPath).Name; } - [SkippableFact(Config.LicenseScanPathEnv, skipOnNullOrWhiteSpaceEnv: true)] + // https://github.com/dotnet/source-build/issues/3668 + //[SkippableFact(Config.LicenseScanPathEnv, skipOnNullOrWhiteSpaceEnv: true)] public void ScanForLicenses() { Assert.NotNull(Config.LicenseScanPath); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs index cf2e1182b..3caada6f7 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs @@ -12,8 +12,9 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests public class PoisonTests : SdkTests { public PoisonTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - - [SkippableFact(Config.PoisonReportPathEnv, skipOnNullOrWhiteSpaceEnv: true)] + + // https://github.com/dotnet/source-build/issues/3668 + // [SkippableFact(Config.PoisonReportPathEnv, skipOnNullOrWhiteSpaceEnv: true)] public void VerifyUsage() { if (!File.Exists(Config.PoisonReportPath)) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs index 29bb7dbc5..8dda3be9e 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs @@ -31,7 +31,8 @@ public class SdkContentTests : SdkTests /// This makes the baseline durable between releases. This does mean however, entries /// in the baseline may appear identical if the diff is version specific. /// - [SkippableFact(new[] { Config.MsftSdkTarballPathEnv, Config.SdkTarballPathEnv }, skipOnNullOrWhiteSpaceEnv: true)] + // https://github.com/dotnet/source-build/issues/3668 + //[SkippableFact(new[] { Config.MsftSdkTarballPathEnv, Config.SdkTarballPathEnv }, skipOnNullOrWhiteSpaceEnv: true)] public void CompareMsftToSbFileList() { const string msftFileListingFileName = "msftSdkFiles.txt"; @@ -44,7 +45,8 @@ public class SdkContentTests : SdkTests BaselineHelper.CompareBaselineContents("MsftToSbSdkFiles.diff", diff, OutputHelper, Config.WarnOnSdkContentDiffs); } - [SkippableFact(new[] { Config.MsftSdkTarballPathEnv, Config.SdkTarballPathEnv }, skipOnNullOrWhiteSpaceEnv: true)] + // https://github.com/dotnet/source-build/issues/3668 + //[SkippableFact(new[] { Config.MsftSdkTarballPathEnv, Config.SdkTarballPathEnv }, skipOnNullOrWhiteSpaceEnv: true)] public void CompareMsftToSbAssemblyVersions() { Assert.NotNull(Config.MsftSdkTarballPath); From c6cc3a77688afea17137389aa4a13dbc968bc8d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Oct 2023 22:12:15 +0200 Subject: [PATCH 107/109] [main] Update dependencies from dotnet/arcade (#17473) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Viktor Hofer --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- eng/common/build.sh | 2 +- eng/common/cross/build-rootfs.sh | 2 +- eng/common/cross/riscv64/tizen/tizen.patch | 9 +++++++++ eng/common/cross/tizen-build-rootfs.sh | 21 +++++++++++++++++++++ eng/common/cross/tizen-fetch.sh | 17 ++++++++++++++--- eng/common/cross/toolchain.cmake | 19 +++++++++++++------ eng/common/sdk-task.ps1 | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 4 ++-- 12 files changed, 74 insertions(+), 26 deletions(-) create mode 100644 eng/common/cross/riscv64/tizen/tizen.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e93bc82d5..af027eb01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,18 +202,18 @@ - + https://github.com/dotnet/arcade - 0e89c8d7ddbb54510d9d0a757fda5126021b79f0 + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 0e89c8d7ddbb54510d9d0a757fda5126021b79f0 + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 0e89c8d7ddbb54510d9d0a757fda5126021b79f0 + 6a5ca678aef84f34a1fccc46f76623f41da56553 https://github.com/dotnet/arcade-services @@ -232,9 +232,9 @@ 26ce96327dd346534926c4551f8b8d62a6fc724f - + https://github.com/dotnet/xliff-tasks - 4f761bf529f4be49842b13d7efcef9af87f0a973 + d66a09c8b11e1235273c8e6cd946e5c8e247f189 diff --git a/eng/Versions.props b/eng/Versions.props index 1f1692aee..0cac0b425 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.23510.4 + 9.0.0-beta.23518.2 diff --git a/eng/common/build.sh b/eng/common/build.sh index 50af40cdd..2c17ba529 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -105,7 +105,7 @@ while [[ $# > 0 ]]; do -binarylog|-bl) binary_log=true ;; - -excludeCIBinarylog|-nobl) + -excludecibinarylog|-nobl) exclude_ci_binary_log=true ;; -pipelineslog|-pl) diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 9caf9b021..4228f202e 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -487,7 +487,7 @@ if [[ "$__CodeName" == "alpine" ]]; then -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" \ - search 'llvm*-libs' | sort | tail -1 | sed 's/-[^-]*//2g')" + search 'llvm*-libs' | grep -E '^llvm' | sort | tail -1 | sed 's/-[^-]*//2g')" fi # install all packages in one go diff --git a/eng/common/cross/riscv64/tizen/tizen.patch b/eng/common/cross/riscv64/tizen/tizen.patch new file mode 100644 index 000000000..eb6d1c074 --- /dev/null +++ b/eng/common/cross/riscv64/tizen/tizen.patch @@ -0,0 +1,9 @@ +diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so +--- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900 ++++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf64-littleriscv) +-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-riscv64-lp64d.so.1 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-riscv64-lp64d.so.1 ) ) diff --git a/eng/common/cross/tizen-build-rootfs.sh b/eng/common/cross/tizen-build-rootfs.sh index ac84173d4..ba31c9328 100644 --- a/eng/common/cross/tizen-build-rootfs.sh +++ b/eng/common/cross/tizen-build-rootfs.sh @@ -22,6 +22,10 @@ case "$ARCH" in TIZEN_ARCH="x86_64" LINK_ARCH="x86" ;; + riscv64) + TIZEN_ARCH="riscv64" + LINK_ARCH="riscv" + ;; *) echo "Unsupported architecture for tizen: $ARCH" exit 1 @@ -58,4 +62,21 @@ rm -rf $TIZEN_TMP_DIR echo ">>Start configuring Tizen rootfs" ln -sfn asm-${LINK_ARCH} ./usr/include/asm patch -p1 < $__TIZEN_CROSSDIR/tizen.patch +if [[ "$TIZEN_ARCH" == "riscv64" ]]; then + echo "Fixing broken symlinks in $PWD" + rm ./usr/lib64/libresolv.so + ln -s ../../lib64/libresolv.so.2 ./usr/lib64/libresolv.so + rm ./usr/lib64/libpthread.so + ln -s ../../lib64/libpthread.so.0 ./usr/lib64/libpthread.so + rm ./usr/lib64/libdl.so + ln -s ../../lib64/libdl.so.2 ./usr/lib64/libdl.so + rm ./usr/lib64/libutil.so + ln -s ../../lib64/libutil.so.1 ./usr/lib64/libutil.so + rm ./usr/lib64/libm.so + ln -s ../../lib64/libm.so.6 ./usr/lib64/libm.so + rm ./usr/lib64/librt.so + ln -s ../../lib64/librt.so.1 ./usr/lib64/librt.so + rm ./lib/ld-linux-riscv64-lp64d.so.1 + ln -s ../lib64/ld-linux-riscv64-lp64d.so.1 ./lib/ld-linux-riscv64-lp64d.so.1 +fi echo "< Date: Thu, 19 Oct 2023 20:24:01 +0000 Subject: [PATCH 108/109] [main] Update dependencies from dotnet/source-build-externals (#17485) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Matt Thalman Co-authored-by: Viktor Hofer --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af027eb01..ce91f0cec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -181,9 +181,9 @@ 8babbda6fb22b1410c256bfffed9a8041ff87025 - + https://github.com/dotnet/source-build-externals - 588fbcbc2a221bc6cea33f12eb73c9117994154e + 54ad220ef4f236325dec31f2c0c66fa48a6fce33 From 22f5e9de96b816a67a4e78119507ba59c22c478c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Oct 2023 20:31:43 +0000 Subject: [PATCH 109/109] [main] Update dependencies from dotnet/source-build-reference-packages (#17310) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Marek Safar Co-authored-by: Viktor Hofer --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce91f0cec..18afccbfc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,9 +227,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 26ce96327dd346534926c4551f8b8d62a6fc724f + 05ffbf9df6c1dc621665ee1864874c4fe6de874c