From b7c6bb4b95f1991d6d0293526f63e89dfe0b693a Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Thu, 23 May 2024 15:42:42 +0300
Subject: [PATCH 1/7] Update SDK to preview 4
---
global.json | 4 ++--
src/mono/sample/wasm/blazor-frame/blazor.csproj | 4 ++--
.../WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/global.json b/global.json
index 5522bd3113834f..5e046beb5c4229 100644
--- a/global.json
+++ b/global.json
@@ -1,11 +1,11 @@
{
"sdk": {
- "version": "9.0.100-preview.3.24204.13",
+ "version": "9.0.100-preview.4.24267.66",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
- "dotnet": "9.0.100-preview.3.24204.13"
+ "dotnet": "9.0.100-preview.4.24267.66"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24266.1",
diff --git a/src/mono/sample/wasm/blazor-frame/blazor.csproj b/src/mono/sample/wasm/blazor-frame/blazor.csproj
index 362f1bc30cb431..35c9e7f36ceeb5 100644
--- a/src/mono/sample/wasm/blazor-frame/blazor.csproj
+++ b/src/mono/sample/wasm/blazor-frame/blazor.csproj
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj b/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj
index 9b556e8a965da2..a9b16c0d71564b 100644
--- a/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj
+++ b/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj
@@ -10,7 +10,7 @@
-
+
From 7b92f03f00f85a59195e56ed541a60b428ac78db Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Thu, 23 May 2024 16:08:06 +0300
Subject: [PATCH 2/7] Update BlazorClient and Shared csprojs
---
.../WasmOnAspNetCore/BlazorClient/BlazorClient.csproj | 4 ++--
.../wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj | 5 +----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj b/src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj
index 5c974a459386c2..392c7992dafca2 100644
--- a/src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj
+++ b/src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj
@@ -12,8 +12,8 @@
-
-
+
+
diff --git a/src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj b/src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj
index 5980a8781983ac..3ddc72d16324b4 100644
--- a/src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj
+++ b/src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj
@@ -11,9 +11,6 @@
-
+
-
-
-
From 4a906779c918adc2cc0389016d0d0432de210549 Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Thu, 23 May 2024 17:23:55 +0300
Subject: [PATCH 3/7] Update System.Reflection.Metadata and co.
---
eng/Version.Details.xml | 36 +++++++++----------
eng/Versions.props | 14 ++++----
.../ILCompiler.TypeSystem.csproj | 5 +--
3 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 86fe520bdc33b7..ec4b36d7420ad2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -282,43 +282,43 @@
https://github.com/dotnet/llvm-project
26f8c30340764cfa7fa9090dc01a36c222bf09c1
-
+
https://github.com/dotnet/runtime
- 073e35e7e32624e0f841d94364d2f28c73662ff7
+ aabefea9ec7c5717177454cd570e48cc55a535bf
-
+
https://github.com/dotnet/runtime
- 073e35e7e32624e0f841d94364d2f28c73662ff7
+ aabefea9ec7c5717177454cd570e48cc55a535bf
-
+
https://github.com/dotnet/runtime
- 073e35e7e32624e0f841d94364d2f28c73662ff7
+ aabefea9ec7c5717177454cd570e48cc55a535bf
-
+
https://github.com/dotnet/runtime
- 073e35e7e32624e0f841d94364d2f28c73662ff7
+ aabefea9ec7c5717177454cd570e48cc55a535bf
-
+
https://github.com/dotnet/runtime
- 073e35e7e32624e0f841d94364d2f28c73662ff7
+ aabefea9ec7c5717177454cd570e48cc55a535bf
-
+
https://github.com/dotnet/runtime
- 073e35e7e32624e0f841d94364d2f28c73662ff7
+ aabefea9ec7c5717177454cd570e48cc55a535bf
-
+
https://github.com/dotnet/runtime
- 073e35e7e32624e0f841d94364d2f28c73662ff7
+ aabefea9ec7c5717177454cd570e48cc55a535bf
-
+
https://github.com/dotnet/runtime
- 073e35e7e32624e0f841d94364d2f28c73662ff7
+ aabefea9ec7c5717177454cd570e48cc55a535bf
-
+
https://github.com/dotnet/runtime
- 073e35e7e32624e0f841d94364d2f28c73662ff7
+ aabefea9ec7c5717177454cd570e48cc55a535bf
https://github.com/dotnet/xharness
diff --git a/eng/Versions.props b/eng/Versions.props
index d584baae90ff5d..9c24382ab5d3db 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -104,10 +104,10 @@
6.0.0-preview.1.102
- 9.0.0-preview.5.24262.2
+ 9.0.0-preview.5.24273.1
6.0.0
- 9.0.0-preview.5.24262.2
+ 9.0.0-preview.5.24273.1
6.0.0
1.1.1
@@ -119,19 +119,19 @@
8.0.0
5.0.0
4.5.5
- 9.0.0-preview.5.24262.2
- 9.0.0-preview.5.24262.2
+ 9.0.0-preview.5.24273.1
+ 9.0.0-preview.5.24273.1
6.0.0
5.0.0
5.0.0
5.0.0
7.0.0
- 9.0.0-preview.5.24262.2
+ 9.0.0-preview.5.24273.1
6.0.0
7.0.0
4.5.4
4.5.0
- 9.0.0-preview.5.24262.2
+ 9.0.0-preview.5.24273.1
8.0.0
8.0.0
@@ -210,7 +210,7 @@
0.11.4-alpha.24230.1
- 9.0.0-preview.5.24262.2
+ 9.0.0-preview.5.24273.1
9.0.0-preview.5.24263.1
diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj b/src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj
index d287e10e97d5f6..269ea5d848c793 100644
--- a/src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj
+++ b/src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj
@@ -30,6 +30,7 @@
+
@@ -714,10 +715,6 @@
-
-
-
-
runtime; build; native; contentfiles; analyzers; buildtransitive
From 06a2f5b969439f851bd2c0ddc74be6a8b6b081cc Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Thu, 23 May 2024 17:25:08 +0300
Subject: [PATCH 4/7] nitpick
---
.../aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj b/src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj
index 269ea5d848c793..92d6b7e836c476 100644
--- a/src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj
+++ b/src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj
@@ -29,7 +29,7 @@
-
+
From f17a10427e0e5a5e7f8bb0fd205619e614d12ab9 Mon Sep 17 00:00:00 2001
From: Adeel <3840695+am11@users.noreply.github.com>
Date: Thu, 23 May 2024 21:21:43 +0300
Subject: [PATCH 5/7] Revert version update
---
eng/Version.Details.xml | 36 ++++++++++++++++++------------------
eng/Versions.props | 14 +++++++-------
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ec4b36d7420ad2..86fe520bdc33b7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -282,43 +282,43 @@
https://github.com/dotnet/llvm-project
26f8c30340764cfa7fa9090dc01a36c222bf09c1
-
+
https://github.com/dotnet/runtime
- aabefea9ec7c5717177454cd570e48cc55a535bf
+ 073e35e7e32624e0f841d94364d2f28c73662ff7
-
+
https://github.com/dotnet/runtime
- aabefea9ec7c5717177454cd570e48cc55a535bf
+ 073e35e7e32624e0f841d94364d2f28c73662ff7
-
+
https://github.com/dotnet/runtime
- aabefea9ec7c5717177454cd570e48cc55a535bf
+ 073e35e7e32624e0f841d94364d2f28c73662ff7
-
+
https://github.com/dotnet/runtime
- aabefea9ec7c5717177454cd570e48cc55a535bf
+ 073e35e7e32624e0f841d94364d2f28c73662ff7
-
+
https://github.com/dotnet/runtime
- aabefea9ec7c5717177454cd570e48cc55a535bf
+ 073e35e7e32624e0f841d94364d2f28c73662ff7
-
+
https://github.com/dotnet/runtime
- aabefea9ec7c5717177454cd570e48cc55a535bf
+ 073e35e7e32624e0f841d94364d2f28c73662ff7
-
+
https://github.com/dotnet/runtime
- aabefea9ec7c5717177454cd570e48cc55a535bf
+ 073e35e7e32624e0f841d94364d2f28c73662ff7
-
+
https://github.com/dotnet/runtime
- aabefea9ec7c5717177454cd570e48cc55a535bf
+ 073e35e7e32624e0f841d94364d2f28c73662ff7
-
+
https://github.com/dotnet/runtime
- aabefea9ec7c5717177454cd570e48cc55a535bf
+ 073e35e7e32624e0f841d94364d2f28c73662ff7
https://github.com/dotnet/xharness
diff --git a/eng/Versions.props b/eng/Versions.props
index 9c24382ab5d3db..d584baae90ff5d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -104,10 +104,10 @@
6.0.0-preview.1.102
- 9.0.0-preview.5.24273.1
+ 9.0.0-preview.5.24262.2
6.0.0
- 9.0.0-preview.5.24273.1
+ 9.0.0-preview.5.24262.2
6.0.0
1.1.1
@@ -119,19 +119,19 @@
8.0.0
5.0.0
4.5.5
- 9.0.0-preview.5.24273.1
- 9.0.0-preview.5.24273.1
+ 9.0.0-preview.5.24262.2
+ 9.0.0-preview.5.24262.2
6.0.0
5.0.0
5.0.0
5.0.0
7.0.0
- 9.0.0-preview.5.24273.1
+ 9.0.0-preview.5.24262.2
6.0.0
7.0.0
4.5.4
4.5.0
- 9.0.0-preview.5.24273.1
+ 9.0.0-preview.5.24262.2
8.0.0
8.0.0
@@ -210,7 +210,7 @@
0.11.4-alpha.24230.1
- 9.0.0-preview.5.24273.1
+ 9.0.0-preview.5.24262.2
9.0.0-preview.5.24263.1
From 62de12346322f6507a82a703883be6fdbe5c197d Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Thu, 23 May 2024 22:16:39 +0300
Subject: [PATCH 6/7] Remove ILCompiler workaround
---
src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj | 7 -------
1 file changed, 7 deletions(-)
diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
index 5b316f9dad594a..823dab33c645c4 100644
--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
@@ -21,18 +21,11 @@
true
true
true
-
- <_ComObjectDescriptorSupport>false
-
From 2a12d1043880beb1d145cae875a371b55d1f2975 Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Fri, 24 May 2024 03:09:11 +0300
Subject: [PATCH 7/7] Remove crossgen2 workaround
---
.../tools/aot/crossgen2/crossgen2_publish.csproj | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj
index 12c95db67944ef..657ac23590a039 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj
@@ -4,17 +4,6 @@
<_IsPublishing>true
-
- <_ComObjectDescriptorSupport>false
-
-
-
-
-
-