From 2f76362650cd7b5a87499d7d3ba710a014c267fa Mon Sep 17 00:00:00 2001 From: Igor Velikorossov Date: Tue, 20 Jun 2023 12:21:55 +1000 Subject: [PATCH 1/8] Update SDK --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 2a4bd537021d..d1c33798c0e1 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "8.0.100-preview.6.23305.3" + "version": "8.0.100-preview.6.23319.37" }, "tools": { - "dotnet": "8.0.100-preview.6.23305.3", + "dotnet": "8.0.100-preview.6.23319.37", "runtimes": { "dotnet/x86": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" From 8b17deed92147ba776d89e438cbce5b60fac116f Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 22 Jun 2023 10:07:01 +0100 Subject: [PATCH 2/8] Fix trimming annotation error --- src/Middleware/Spa/SpaProxy/src/SpaHostingStartup.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Middleware/Spa/SpaProxy/src/SpaHostingStartup.cs b/src/Middleware/Spa/SpaProxy/src/SpaHostingStartup.cs index 65ea9170726e..8c331281d6cf 100644 --- a/src/Middleware/Spa/SpaProxy/src/SpaHostingStartup.cs +++ b/src/Middleware/Spa/SpaProxy/src/SpaHostingStartup.cs @@ -31,7 +31,7 @@ public void Configure(IWebHostBuilder builder) }); [UnconditionalSuppressMessageAttribute("Trimming", "IL2026", Justification = "Configuration object's public properties are preserved.")] - static void ConfigureOptions<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] T>(IServiceCollection services, IConfigurationSection section) + static void ConfigureOptions<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(IServiceCollection services, IConfigurationSection section) where T : class { services.Configure(section); From 47f5966db4d1343e0dce44dbb388f2fc75a03db7 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 22 Jun 2023 10:34:11 +0100 Subject: [PATCH 3/8] Supress RID resolution warning --- eng/Workarounds.props | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/eng/Workarounds.props b/eng/Workarounds.props index a9561f837698..bfd2e0ef11ba 100644 --- a/eng/Workarounds.props +++ b/eng/Workarounds.props @@ -42,4 +42,11 @@ false + + + + + + + From 3755745e84c16b43778414d8f53181893f02e94d Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 22 Jun 2023 11:30:19 +0100 Subject: [PATCH 4/8] Update SDK further to get fix https://github.com/dotnet/runtime/pull/87659 --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index d1c33798c0e1..9a5ce2b6c00f 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "8.0.100-preview.6.23319.37" + "version": "8.0.100-preview.7.23321.23" }, "tools": { - "dotnet": "8.0.100-preview.6.23319.37", + "dotnet": "8.0.100-preview.7.23321.23", "runtimes": { "dotnet/x86": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" From 56d83106b172178210346d9001b85a3eef584c00 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 22 Jun 2023 14:16:28 +0100 Subject: [PATCH 5/8] Attempted further workaround --- .../TestInfrastructure/Directory.Build.props.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/ProjectTemplates/TestInfrastructure/Directory.Build.props.in b/src/ProjectTemplates/TestInfrastructure/Directory.Build.props.in index 88c7d6173021..3bcf2c7b4b18 100644 --- a/src/ProjectTemplates/TestInfrastructure/Directory.Build.props.in +++ b/src/ProjectTemplates/TestInfrastructure/Directory.Build.props.in @@ -10,4 +10,11 @@ $(RestoreAdditionalProjectSources);$(ArtifactsShippingPackagesDir) + + + + + + + From db226bb7036f9403f965d3e9f83b7e4f17962137 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 22 Jun 2023 18:17:36 +0100 Subject: [PATCH 6/8] Revert attempted workaround that didn't work --- .../TestInfrastructure/Directory.Build.props.in | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/ProjectTemplates/TestInfrastructure/Directory.Build.props.in b/src/ProjectTemplates/TestInfrastructure/Directory.Build.props.in index 3bcf2c7b4b18..88c7d6173021 100644 --- a/src/ProjectTemplates/TestInfrastructure/Directory.Build.props.in +++ b/src/ProjectTemplates/TestInfrastructure/Directory.Build.props.in @@ -10,11 +10,4 @@ $(RestoreAdditionalProjectSources);$(ArtifactsShippingPackagesDir) - - - - - - - From 9db37bd0f9ae496f4c13b63522aea4c2aa5bf437 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Fri, 23 Jun 2023 19:08:16 +0000 Subject: [PATCH 7/8] Disable RID check in templates with SQLite --- .../Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in | 5 +++++ .../Web.ProjectTemplates/StarterWeb-CSharp.csproj.in | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in index bb4de59b14bc..537e5a4b69b5 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in @@ -32,5 +32,10 @@ + + + + + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in index 444453017f10..d9d0cc2afed2 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in @@ -32,5 +32,10 @@ + + + + + From 719fc18d38d229f695b9731438327f11cdc38c21 Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Fri, 23 Jun 2023 17:37:53 -0700 Subject: [PATCH 8/8] Try different location for RID workaround --- eng/Workarounds.props | 7 ------- eng/tools/GenerateFiles/Directory.Build.props.in | 7 +++++++ .../Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in | 5 ----- .../Web.ProjectTemplates/StarterWeb-CSharp.csproj.in | 5 ----- 4 files changed, 7 insertions(+), 17 deletions(-) diff --git a/eng/Workarounds.props b/eng/Workarounds.props index bfd2e0ef11ba..a9561f837698 100644 --- a/eng/Workarounds.props +++ b/eng/Workarounds.props @@ -42,11 +42,4 @@ false - - - - - - - diff --git a/eng/tools/GenerateFiles/Directory.Build.props.in b/eng/tools/GenerateFiles/Directory.Build.props.in index 619ec1ded3d9..dd4ea40b86b6 100644 --- a/eng/tools/GenerateFiles/Directory.Build.props.in +++ b/eng/tools/GenerateFiles/Directory.Build.props.in @@ -8,4 +8,11 @@ true + + + + + + + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in index 537e5a4b69b5..bb4de59b14bc 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in @@ -32,10 +32,5 @@ - - - - - diff --git a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in index d9d0cc2afed2..444453017f10 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in @@ -32,10 +32,5 @@ - - - - -