From 002cdb70bf8cb084c540d7fa7cb0908a5e36c2c5 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 11 Nov 2024 10:55:20 -0600 Subject: [PATCH 01/17] Remove AI in Microsoft.Extensions.AI.AotCompatibility.TestApp --- .../Microsoft.Extensions.AotCompatibility.TestApp.csproj} | 0 .../Program.cs | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename test/Libraries/{Microsoft.Extensions.AI.AotCompatibility.TestApp/Microsoft.Extensions.AI.AotCompatibility.TestApp.csproj => Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj} (100%) rename test/Libraries/{Microsoft.Extensions.AI.AotCompatibility.TestApp => Microsoft.Extensions.AotCompatibility.TestApp}/Program.cs (100%) diff --git a/test/Libraries/Microsoft.Extensions.AI.AotCompatibility.TestApp/Microsoft.Extensions.AI.AotCompatibility.TestApp.csproj b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj similarity index 100% rename from test/Libraries/Microsoft.Extensions.AI.AotCompatibility.TestApp/Microsoft.Extensions.AI.AotCompatibility.TestApp.csproj rename to test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj diff --git a/test/Libraries/Microsoft.Extensions.AI.AotCompatibility.TestApp/Program.cs b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Program.cs similarity index 100% rename from test/Libraries/Microsoft.Extensions.AI.AotCompatibility.TestApp/Program.cs rename to test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Program.cs From 86deeab76eaecd9f0cf8726a2836acd92d06e72f Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 11 Nov 2024 11:05:06 -0600 Subject: [PATCH 02/17] Clean up the AotCompatibility.TestApp - Remove unnecessary code in Program.cs by turning off ReferenceTrimmer - Make the project publishable without passing in a TFM by only targeting a single TFM --- ....Extensions.AotCompatibility.TestApp.csproj | 7 ++++++- .../Program.cs | 18 ------------------ 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj index 183cd150937..24495361ffb 100644 --- a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj +++ b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj @@ -2,13 +2,18 @@ Exe - $(LatestTargetFramework) + $(LatestTargetFramework) + + true false true + + + diff --git a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Program.cs b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Program.cs index b518dfa7739..c8b0819a744 100644 --- a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Program.cs +++ b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Program.cs @@ -1,22 +1,4 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -#pragma warning disable S125 // Remove this commented out code - -using Microsoft.Extensions.AI; - -// Use types from each library. - -// Microsoft.Extensions.AI.Ollama -using var b = new OllamaChatClient("http://localhost:11434", "llama3.2"); - -// Microsoft.Extensions.AI.AzureAIInference -// using var a = new Azure.AI.Inference.ChatCompletionClient(new Uri("http://localhost"), new("apikey")); // uncomment once warnings in Azure.AI.Inference are addressed - -// Microsoft.Extensions.AI.OpenAI -// using var c = new OpenAI.OpenAIClient("apikey").AsChatClient("gpt-4o-mini"); // uncomment once warnings in OpenAI are addressed - -// Microsoft.Extensions.AI -AIFunctionFactory.Create(() => { }); - System.Console.WriteLine("Success!"); From c847f9a6158cc71ea34afb8353143075f054797f Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 11 Nov 2024 13:45:26 -0600 Subject: [PATCH 03/17] Make dotnet test publish the TestApp and fail if there are any warnings/errors --- ...osoft.Extensions.AotCompatibility.TestApp.csproj | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj index 24495361ffb..48e0c614c40 100644 --- a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj +++ b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj @@ -1,4 +1,5 @@ - + + Exe @@ -17,6 +18,7 @@ + @@ -28,4 +30,13 @@ + + + + + + + + From 10fcb7bbc980688ebedd27ace9f4e681191de27c Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 11 Nov 2024 14:44:16 -0600 Subject: [PATCH 04/17] Hook the Test target as well so the test runs in CI --- ...crosoft.Extensions.AotCompatibility.TestApp.csproj | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj index 48e0c614c40..6df7aff391f 100644 --- a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj +++ b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj @@ -9,6 +9,8 @@ true false true + + Clean;$(PrepareForBuildDependsOn) @@ -32,11 +34,14 @@ - - - + + + + + + From 33e95b87cc1a9d0ab0f28f83823ee5f7d1bb6e03 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 11 Nov 2024 15:14:53 -0600 Subject: [PATCH 05/17] Move clean logic to target. Include the rest of the libraries in the repo --- ...Extensions.AotCompatibility.TestApp.csproj | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj index 6df7aff391f..d0627d984f6 100644 --- a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj +++ b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj @@ -9,32 +9,35 @@ true false true - - Clean;$(PrepareForBuildDependsOn) - - - - - - - - - + + + + + + + + + + + + + + + + + From 9fbc27c38e55234a404bb223cf1b4f5f291f1df3 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 11 Nov 2024 15:52:35 -0600 Subject: [PATCH 06/17] - Add tracing issues. - Ensure clean uses the same configuration as publish - Fix part of Compliance.Redaction trimming issues by reenabling the Config Binder source generator. --- ...icrosoft.Extensions.Compliance.Redaction.csproj | 3 ++- ...soft.Extensions.AotCompatibility.TestApp.csproj | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Libraries/Microsoft.Extensions.Compliance.Redaction/Microsoft.Extensions.Compliance.Redaction.csproj b/src/Libraries/Microsoft.Extensions.Compliance.Redaction/Microsoft.Extensions.Compliance.Redaction.csproj index 79fbecf8c1e..f762e3ceee9 100644 --- a/src/Libraries/Microsoft.Extensions.Compliance.Redaction/Microsoft.Extensions.Compliance.Redaction.csproj +++ b/src/Libraries/Microsoft.Extensions.Compliance.Redaction/Microsoft.Extensions.Compliance.Redaction.csproj @@ -7,13 +7,14 @@ true + true true true true true true - + false $(NoWarn);IL2026 diff --git a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj index d0627d984f6..4944cdc4d37 100644 --- a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj +++ b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj @@ -20,12 +20,12 @@ - - - + - - + + + + @@ -35,10 +35,10 @@ - - From fbf2866b346aa18ee5ab8cee9ef0c1b2eb072bd4 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 11 Nov 2024 16:53:21 -0600 Subject: [PATCH 07/17] Add tracking issue links for OpenAI and Azure.AI.Inference trim/AOT compatibility. --- .../Microsoft.Extensions.AotCompatibility.TestApp.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj index 4944cdc4d37..e82e071561a 100644 --- a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj +++ b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj @@ -16,9 +16,9 @@ - + - + From ff0bf8ca5030f8c1145f7a3b53391a093d92ddb8 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 11 Nov 2024 18:15:40 -0600 Subject: [PATCH 08/17] Add an exclusion for Microsoft.Extensions.AI.Abstractions --- .../Microsoft.Extensions.AotCompatibility.TestApp.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj index e82e071561a..fdf1115e8f9 100644 --- a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj +++ b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj @@ -16,6 +16,8 @@ + + From 12b894951296c6eecf0b8f3be9bea1318eba9dee Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 11 Nov 2024 21:56:23 -0600 Subject: [PATCH 09/17] Exclude Microsoft.Extensions.AI as well, since it hits the warnings in #5626 --- .../Microsoft.Extensions.AotCompatibility.TestApp.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj index fdf1115e8f9..27c8608d61d 100644 --- a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj +++ b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj @@ -18,6 +18,7 @@ + From 7d554db60ca7357b9fcd6bebdf114878224b7b2b Mon Sep 17 00:00:00 2001 From: Haipz Date: Tue, 12 Nov 2024 15:46:47 +0800 Subject: [PATCH 10/17] Cache current process object to avoid performance hit (#5597) * Read working set from Environment in ProcessInfo since it has better performance. * Add unit test for ProcessInfo. * Remove OSSkipCondition tag from process info unit test since it's cross-platform. * Use Environment.WorkingSet in GetMemoryUsageInBytes. --- .../Windows/Interop/ProcessInfo.cs | 4 ++-- .../Windows/WindowsSnapshotProvider.cs | 3 +-- .../Windows/ProcessInfoTests.cs | 23 +++++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Windows/ProcessInfoTests.cs diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/Interop/ProcessInfo.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/Interop/ProcessInfo.cs index cb5febeff55..fb5223f3d02 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/Interop/ProcessInfo.cs +++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/Interop/ProcessInfo.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; @@ -41,7 +42,6 @@ public ulong GetMemoryUsage() public ulong GetCurrentProcessMemoryUsage() { - using Process process = Process.GetCurrentProcess(); - return (ulong)process.WorkingSet64; + return (ulong)Environment.WorkingSet; } } diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsSnapshotProvider.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsSnapshotProvider.cs index 7197499afd9..da828a2d064 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsSnapshotProvider.cs +++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsSnapshotProvider.cs @@ -109,8 +109,7 @@ internal static long GetCpuTicks() internal static long GetMemoryUsageInBytes() { - using var process = Process.GetCurrentProcess(); - return process.WorkingSet64; + return Environment.WorkingSet; } internal static ulong GetTotalMemoryInBytes() diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Windows/ProcessInfoTests.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Windows/ProcessInfoTests.cs new file mode 100644 index 00000000000..ab83f2677df --- /dev/null +++ b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Windows/ProcessInfoTests.cs @@ -0,0 +1,23 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using Microsoft.Extensions.Diagnostics.ResourceMonitoring.Windows.Interop; +using Microsoft.TestUtilities; +using Xunit; + +namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring.Windows.Test; + +/// +/// Process Info Interop Tests. +/// +/// These tests are added for coverage reasons, but the code doesn't have +/// the necessary environment predictability to really test it. +public sealed class ProcessInfoTests +{ + [ConditionalFact] + public void GetCurrentProcessMemoryUsage() + { + var workingSet64 = new ProcessInfo().GetCurrentProcessMemoryUsage(); + Assert.True(workingSet64 > 0); + } +} From 9c675f19132a687f45af6a29ad1e63d52f6c4cf2 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 12 Nov 2024 10:58:04 -0600 Subject: [PATCH 11/17] Remove cleaning from publish --- .../Microsoft.Extensions.AotCompatibility.TestApp.csproj | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj index 27c8608d61d..d2bf9f55080 100644 --- a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj +++ b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj @@ -37,11 +37,7 @@ - - - - From 5b339698afc3087b1c11648ca14d04585725f93b Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 12 Nov 2024 11:09:16 -0600 Subject: [PATCH 12/17] Remove MS.Ext.AI now that the issue is resolved. --- .../Microsoft.Extensions.AotCompatibility.TestApp.csproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj index d2bf9f55080..3f7270570c2 100644 --- a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj +++ b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj @@ -16,9 +16,6 @@ - - - From 47beb96689bfa1ed4651c7bfacc42e8ece8dedc5 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 12 Nov 2024 14:10:49 -0600 Subject: [PATCH 13/17] Temporarily disable the test to figure out what is causing the code coverage errors. --- .../Microsoft.Extensions.AotCompatibility.TestApp.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj index 3f7270570c2..dcd6f638232 100644 --- a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj +++ b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj @@ -40,7 +40,7 @@ - - + From 0a4bbeed0eb451ac6484c8bdcf25eb3495f67637 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 12 Nov 2024 15:53:09 -0600 Subject: [PATCH 14/17] Revert "Temporarily disable the test to figure out what is causing the code coverage errors." This reverts commit 47beb96689bfa1ed4651c7bfacc42e8ece8dedc5. --- .../Microsoft.Extensions.AotCompatibility.TestApp.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj index dcd6f638232..3f7270570c2 100644 --- a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj +++ b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj @@ -40,7 +40,7 @@ - + + From e690bbf4b7e88a8d57925a57f591eab132985069 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 12 Nov 2024 16:00:54 -0600 Subject: [PATCH 15/17] try running during BuildAndTest.yml --- eng/pipelines/templates/BuildAndTest.yml | 4 ++++ .../Microsoft.Extensions.AotCompatibility.TestApp.csproj | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/templates/BuildAndTest.yml b/eng/pipelines/templates/BuildAndTest.yml index ced3ce0afb3..e3ec5bcd7dd 100644 --- a/eng/pipelines/templates/BuildAndTest.yml +++ b/eng/pipelines/templates/BuildAndTest.yml @@ -68,6 +68,10 @@ steps: condition: always() continueOnError: true + - script: $(Build.SourcesDirectory)/.dotnet/dotnet publish + workingDirectory: $(Build.SourcesDirectory)/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp + displayName: Publish AOT Test + - ${{ if ne(parameters.skipQualityGates, 'true') }}: - ${{ if eq(parameters.runAsPublic, 'true') }}: - task: PublishPipelineArtifact@1 diff --git a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj index 3f7270570c2..dd60f67d060 100644 --- a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj +++ b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj @@ -25,7 +25,7 @@ - + @@ -40,7 +40,7 @@ - - + From 30dae3db7a269936a36e78da66487eae579856ba Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 12 Nov 2024 16:46:21 -0600 Subject: [PATCH 16/17] Remove testing cruft from TestApp project --- ...t.Extensions.AotCompatibility.TestApp.csproj | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj index dd60f67d060..59b896ccf8a 100644 --- a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj +++ b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -25,22 +24,10 @@ - + - - - - - - - - - - From 4cd0228eeb526e4bebc2b132c97653aeffed80a9 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 12 Nov 2024 18:17:16 -0600 Subject: [PATCH 17/17] Change TrimmerRootAssembly to use FileName to be correct. --- .../Microsoft.Extensions.AotCompatibility.TestApp.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj index 59b896ccf8a..07bf93e044c 100644 --- a/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj +++ b/test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj @@ -26,7 +26,7 @@ - +