diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce0a8976c880..5140c74fb275 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - df6965525ff1b8bf600b553976ef37dd5f093e49 + 5a1e9820f87fa9a9896d0979f9d6f6d1512f8e5d - + https://github.com/dotnet/templating - df6965525ff1b8bf600b553976ef37dd5f093e49 + 5a1e9820f87fa9a9896d0979f9d6f6d1512f8e5d - + https://github.com/dotnet/templating - df6965525ff1b8bf600b553976ef37dd5f093e49 + 5a1e9820f87fa9a9896d0979f9d6f6d1512f8e5d diff --git a/eng/Versions.props b/eng/Versions.props index 4ba1881a1218..d6af12515889 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.24319.1 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.100-preview.6.24313.5 + 9.0.100-preview.6.24319.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) 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 @@ - 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 @@ - - - -- -+ - - -