From a6ad536f6229f4156ea8d4f2984285d897ff3310 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jun 2024 07:03:31 +0000 Subject: [PATCH 01/11] Update dependencies from https://github.com/dotnet/templating build 20240616.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.100-preview.6.24313.5 -> To Version 9.0.100-preview.6.24316.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fc82aa31b0a..54420a267915 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - df6965525ff1b8bf600b553976ef37dd5f093e49 + 5cbcd39027f739dd3ce1e5d50cfb99446a605491 - + https://github.com/dotnet/templating - df6965525ff1b8bf600b553976ef37dd5f093e49 + 5cbcd39027f739dd3ce1e5d50cfb99446a605491 - + https://github.com/dotnet/templating - df6965525ff1b8bf600b553976ef37dd5f093e49 + 5cbcd39027f739dd3ce1e5d50cfb99446a605491 diff --git a/eng/Versions.props b/eng/Versions.props index ec158c0f7304..b251232334c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -207,13 +207,13 @@ - 9.0.100-preview.6.24313.5 + 9.0.100-preview.6.24316.1 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.100-preview.6.24313.5 + 9.0.100-preview.6.24316.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From f50b38c48d79325607dd4a406b181b40c6d0d7fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jun 2024 23:02:03 +0000 Subject: [PATCH 02/11] Update dependencies from https://github.com/dotnet/templating build 20240617.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.100-preview.6.24313.5 -> To Version 9.0.100-preview.6.24317.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54420a267915..33333adc3c38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - 5cbcd39027f739dd3ce1e5d50cfb99446a605491 + e1bb3b97390354b5282dc5e551a8f22ff5aa3f0f - + https://github.com/dotnet/templating - 5cbcd39027f739dd3ce1e5d50cfb99446a605491 + e1bb3b97390354b5282dc5e551a8f22ff5aa3f0f - + https://github.com/dotnet/templating - 5cbcd39027f739dd3ce1e5d50cfb99446a605491 + e1bb3b97390354b5282dc5e551a8f22ff5aa3f0f diff --git a/eng/Versions.props b/eng/Versions.props index b251232334c2..ab39e014e784 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -207,13 +207,13 @@ - 9.0.100-preview.6.24316.1 + 9.0.100-preview.6.24317.1 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.100-preview.6.24316.1 + 9.0.100-preview.6.24317.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 6d413ddd7cd655ba24d858bc801d06fb2a91b4a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jun 2024 23:57:59 +0000 Subject: [PATCH 03/11] Update dependencies from https://github.com/dotnet/templating build 20240617.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.100-preview.6.24313.5 -> To Version 9.0.100-preview.6.24317.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33333adc3c38..9104ea7daba1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - e1bb3b97390354b5282dc5e551a8f22ff5aa3f0f + b1a400589eb43f9b3a5603f1988319fc3e4f5fbd - + https://github.com/dotnet/templating - e1bb3b97390354b5282dc5e551a8f22ff5aa3f0f + b1a400589eb43f9b3a5603f1988319fc3e4f5fbd - + https://github.com/dotnet/templating - e1bb3b97390354b5282dc5e551a8f22ff5aa3f0f + b1a400589eb43f9b3a5603f1988319fc3e4f5fbd diff --git a/eng/Versions.props b/eng/Versions.props index ab39e014e784..55e55840a79e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -207,13 +207,13 @@ - 9.0.100-preview.6.24317.1 + 9.0.100-preview.6.24317.2 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.100-preview.6.24317.1 + 9.0.100-preview.6.24317.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 65054f48f2d80c76fb69678421161b791d3584dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2024 01:45:14 +0000 Subject: [PATCH 04/11] Update dependencies from https://github.com/dotnet/templating build 20240617.3 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.100-preview.6.24313.5 -> To Version 9.0.100-preview.6.24317.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9104ea7daba1..82ef7deef277 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - b1a400589eb43f9b3a5603f1988319fc3e4f5fbd + d3cacef876ab0f1f9639ab06c2c22145ecf38b68 - + https://github.com/dotnet/templating - b1a400589eb43f9b3a5603f1988319fc3e4f5fbd + d3cacef876ab0f1f9639ab06c2c22145ecf38b68 - + https://github.com/dotnet/templating - b1a400589eb43f9b3a5603f1988319fc3e4f5fbd + d3cacef876ab0f1f9639ab06c2c22145ecf38b68 diff --git a/eng/Versions.props b/eng/Versions.props index 55e55840a79e..5b433bea4bb1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -207,13 +207,13 @@ - 9.0.100-preview.6.24317.2 + 9.0.100-preview.6.24317.3 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.100-preview.6.24317.2 + 9.0.100-preview.6.24317.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 24bcd0130a5bc441bb0d4bce4e76cb24c4443da6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2024 03:24:12 +0000 Subject: [PATCH 05/11] Update dependencies from https://github.com/dotnet/templating build 20240617.4 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.100-preview.6.24313.5 -> To Version 9.0.100-preview.6.24317.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82ef7deef277..fc4fc4dc641e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - d3cacef876ab0f1f9639ab06c2c22145ecf38b68 + 94511ea66a81ccc4941ca20ea8b41694360778ef - + https://github.com/dotnet/templating - d3cacef876ab0f1f9639ab06c2c22145ecf38b68 + 94511ea66a81ccc4941ca20ea8b41694360778ef - + https://github.com/dotnet/templating - d3cacef876ab0f1f9639ab06c2c22145ecf38b68 + 94511ea66a81ccc4941ca20ea8b41694360778ef diff --git a/eng/Versions.props b/eng/Versions.props index 5b433bea4bb1..8e1c8bd656d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -207,13 +207,13 @@ - 9.0.100-preview.6.24317.3 + 9.0.100-preview.6.24317.4 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.100-preview.6.24317.3 + 9.0.100-preview.6.24317.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From ef9feb6ac3a07c0e0648da0df55a04f239610bd9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2024 21:54:55 +0000 Subject: [PATCH 06/11] Update dependencies from https://github.com/dotnet/templating build 20240618.3 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.100-preview.6.24313.5 -> To Version 9.0.100-preview.6.24318.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc4fc4dc641e..e79356313c40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - 94511ea66a81ccc4941ca20ea8b41694360778ef + 0ae8b68835fec507aa461a5a8b04a72befcb19bb - + https://github.com/dotnet/templating - 94511ea66a81ccc4941ca20ea8b41694360778ef + 0ae8b68835fec507aa461a5a8b04a72befcb19bb - + https://github.com/dotnet/templating - 94511ea66a81ccc4941ca20ea8b41694360778ef + 0ae8b68835fec507aa461a5a8b04a72befcb19bb diff --git a/eng/Versions.props b/eng/Versions.props index 8e1c8bd656d5..6932c624bb33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -207,13 +207,13 @@ - 9.0.100-preview.6.24317.4 + 9.0.100-preview.6.24318.3 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.100-preview.6.24317.4 + 9.0.100-preview.6.24318.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From bffd9368cfac60e90895745de26a850663f148d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2024 22:50:00 +0000 Subject: [PATCH 07/11] Update dependencies from https://github.com/dotnet/templating build 20240618.4 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.100-preview.6.24313.5 -> To Version 9.0.100-preview.6.24318.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e79356313c40..8a21d58f23f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - 0ae8b68835fec507aa461a5a8b04a72befcb19bb + 7bee91dacd9b6889739c1760d97b908a40786698 - + https://github.com/dotnet/templating - 0ae8b68835fec507aa461a5a8b04a72befcb19bb + 7bee91dacd9b6889739c1760d97b908a40786698 - + https://github.com/dotnet/templating - 0ae8b68835fec507aa461a5a8b04a72befcb19bb + 7bee91dacd9b6889739c1760d97b908a40786698 diff --git a/eng/Versions.props b/eng/Versions.props index 6932c624bb33..079915f8b984 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -207,13 +207,13 @@ - 9.0.100-preview.6.24318.3 + 9.0.100-preview.6.24318.4 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.100-preview.6.24318.3 + 9.0.100-preview.6.24318.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From ae5d9bd355bd2a3026b72d8edcf982802e584970 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2024 16:36:04 +0000 Subject: [PATCH 08/11] Update dependencies from https://github.com/dotnet/templating build 20240619.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.100-preview.6.24313.5 -> To Version 9.0.100-preview.6.24319.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a21d58f23f8..868c3e4fd1eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - 7bee91dacd9b6889739c1760d97b908a40786698 + 5a1e9820f87fa9a9896d0979f9d6f6d1512f8e5d - + https://github.com/dotnet/templating - 7bee91dacd9b6889739c1760d97b908a40786698 + 5a1e9820f87fa9a9896d0979f9d6f6d1512f8e5d - + https://github.com/dotnet/templating - 7bee91dacd9b6889739c1760d97b908a40786698 + 5a1e9820f87fa9a9896d0979f9d6f6d1512f8e5d diff --git a/eng/Versions.props b/eng/Versions.props index 079915f8b984..ba7dae35b734 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -207,13 +207,13 @@ - 9.0.100-preview.6.24318.4 + 9.0.100-preview.6.24319.1 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.100-preview.6.24318.4 + 9.0.100-preview.6.24319.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 9583b82b8d785207e8875f03ce7e55a15ebebe80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2024 18:25:11 +0000 Subject: [PATCH 09/11] Update dependencies from https://github.com/dotnet/templating build 20240619.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.100-preview.6.24313.5 -> To Version 9.0.100-preview.6.24319.1 From 68ad6fa3ab9275a8dd9f5bcfed3d7afd3b314e50 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 19 Jun 2024 20:28:53 +0200 Subject: [PATCH 10/11] Remove live runtime dependency from templating.proj --- src/SourceBuild/content/repo-projects/templating.proj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/SourceBuild/content/repo-projects/templating.proj b/src/SourceBuild/content/repo-projects/templating.proj index 82538bf0d034..631a1cddaaec 100644 --- a/src/SourceBuild/content/repo-projects/templating.proj +++ b/src/SourceBuild/content/repo-projects/templating.proj @@ -9,7 +9,6 @@ - From d3150f20ce6f9726f5e721c69ceb2107fabc148e Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 20 Jun 2024 20:10:46 +0200 Subject: [PATCH 11/11] Delete src/SourceBuild/patches/roslyn/0002-versionsprops-and-details.patch --- .../0002-versionsprops-and-details.patch | 93 ------------------- 1 file changed, 93 deletions(-) delete mode 100644 src/SourceBuild/patches/roslyn/0002-versionsprops-and-details.patch diff --git a/src/SourceBuild/patches/roslyn/0002-versionsprops-and-details.patch b/src/SourceBuild/patches/roslyn/0002-versionsprops-and-details.patch deleted file mode 100644 index 31286b95da58..000000000000 --- a/src/SourceBuild/patches/roslyn/0002-versionsprops-and-details.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 642134215a2c7285e958dfc8aa6fb058a836c6da Mon Sep 17 00:00:00 2001 -From: Viktor Hofer -Date: Wed, 19 Jun 2024 10:32:23 +0000 -Subject: [PATCH] Correctly define versions for runtime dependencies - -System.ComponentModel.Composition and -System.IO.Hashing were missing Versions.props and -Version.Details.xml entries. - -This is necessary so that the VMR can upgrade -the dependencies when building all dependencies -live. - -Similar to c74b31bd8313865fa3becf0d8f91f00d528ca5ad -Unblocks runtime dependency flow: -https://github.com/dotnet/sdk/pull/41616 - -Backport PR: https://github.com/dotnet/roslyn/pull/74060 - ---- - eng/Directory.Packages.props | 4 ++-- - eng/Version.Details.xml | 8 ++++++++ - eng/Versions.props | 2 ++ - .../Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj | 2 +- - 4 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props -index 83ab7a5601433..e93b49fa24c55 100644 ---- a/eng/Directory.Packages.props -+++ b/eng/Directory.Packages.props -@@ -190,10 +190,10 @@ - - - -- -+ - - -- -+ - - - -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index 0e070103b4b0c..7852558f7c3e6 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -64,10 +64,18 @@ - https://github.com/dotnet/runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 - -+ -+ https://github.com/dotnet/runtime -+ 5535e31a712343a63f5d7d796cd874e563e5ac14 -+ - - https://github.com/dotnet/runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 - -+ -+ https://github.com/dotnet/runtime -+ 5535e31a712343a63f5d7d796cd874e563e5ac14 -+ - - https://github.com/dotnet/runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 -diff --git a/eng/Versions.props b/eng/Versions.props -index 0f39e2822c158..1f9c7b8d08ec2 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -25,7 +25,9 @@ - 8.0.0 - 8.0.0 - 8.0.0 -+ 8.0.0 - 8.0.0 -+ 8.0.0 - 8.0.0 - 8.0.0 - 8.0.0 -diff --git a/src/Tools/ExternalAccess/Xaml/Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj b/src/Tools/ExternalAccess/Xaml/Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj -index 8a011c5f82948..4310078bf9b32 100644 ---- a/src/Tools/ExternalAccess/Xaml/Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj -+++ b/src/Tools/ExternalAccess/Xaml/Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj -@@ -27,7 +27,7 @@ - - - -- -+ - - -