From 5cd26b3c1cb6ae7941ef9244f4cfc82832c7014f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 11 Dec 2024 13:53:34 -0800 Subject: [PATCH 1/6] Add an assert and suppress nullable warnings on netfx --- Directory.Build.targets | 10 ++++++++++ src/Cli/Microsoft.DotNet.Cli.Utils/Command.cs | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index eb3a879221b8..6db39856dfc1 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,6 +1,16 @@ + + + true + diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Command.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/Command.cs index 9a0683694ba6..fd634c174ad6 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/Command.cs +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Command.cs @@ -74,11 +74,12 @@ public CommandResult Execute(Action? processStarted) if (CommandLoggingContext.IsVerbose) { + Debug.Assert(sw is not null); var message = string.Format( LocalizableStrings.ProcessExitedWithCode, FormatProcessInfo(_process.StartInfo), exitCode, - sw?.ElapsedMilliseconds); + sw.ElapsedMilliseconds); if (exitCode == 0) { Reporter.Verbose.WriteLine(message.Green()); From 4e1f2d3a84f9112f69b2e7a333c567e2a12417e5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 11 Dec 2024 13:53:52 -0800 Subject: [PATCH 2/6] Remove the dotnet core blob feed that's causing test issues --- .../GivenThatWeHaveAPackageReferenceWithAliases.cs | 6 +++--- .../GivenThatWeWantToBuildANetCoreApp.cs | 2 +- .../GivenThatWeWantToGenerateADepsFileForATool.cs | 4 ++-- .../GivenThatWeWantToStoreAProjectWithDependencies.cs | 2 +- .../GivenThatWeWantToIgnoreObsoleteDotNetCliToolPackages.cs | 2 +- .../GivenThatWeWantToRestoreDotNetCliToolReference.cs | 2 +- test/Microsoft.NET.TestFramework/NuGetConfigWriter.cs | 1 - 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs index 1d2114cbe0ab..861684cb342e 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs @@ -39,7 +39,7 @@ public void CanBuildProjectWithPackageReferencesWithConflictingTypes() var testAsset = _testAssetsManager.CreateTestProject(testProject); var packagesPaths = packageReferences.Select(e => Path.GetDirectoryName(e.NupkgPath)); - List sources = new() { NuGetConfigWriter.DotnetCoreBlobFeed }; + List sources = new(); sources.AddRange(packagesPaths); NuGetConfigWriter.Write(testAsset.TestRoot, sources); @@ -85,7 +85,7 @@ public void CanBuildProjectWithMultiplePackageReferencesWithAliases() testProject.SourceFiles[$"{testProject.Name}.cs"] = ClassLibAandBUsage; var testAsset = _testAssetsManager.CreateTestProject(testProject); - List sources = new() { NuGetConfigWriter.DotnetCoreBlobFeed, Path.GetDirectoryName(packageReferenceA.NupkgPath), Path.GetDirectoryName(packageReferenceB.NupkgPath) }; + List sources = new() { Path.GetDirectoryName(packageReferenceA.NupkgPath), Path.GetDirectoryName(packageReferenceB.NupkgPath) }; NuGetConfigWriter.Write(testAsset.TestRoot, sources); var buildCommand = new BuildCommand(testAsset) @@ -122,7 +122,7 @@ public void CanBuildProjectWithAPackageReferenceWithMultipleAliases() testProject.SourceFiles[$"{testProject.Name}.cs"] = ClassLibAandBUsage; var testAsset = _testAssetsManager.CreateTestProject(testProject); - List sources = new() { NuGetConfigWriter.DotnetCoreBlobFeed, Path.GetDirectoryName(packageReferenceA.NupkgPath) }; + List sources = new() { Path.GetDirectoryName(packageReferenceA.NupkgPath) }; NuGetConfigWriter.Write(testAsset.TestRoot, sources); var buildCommand = new BuildCommand(testAsset) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs index 05a1a3aaec49..36e9637febc8 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs @@ -133,7 +133,7 @@ private void It_targets_the_right_framework( var testAsset = _testAssetsManager.CreateTestProject(testProject, testIdentifier); - NuGetConfigWriter.Write(testAsset.TestRoot, NuGetConfigWriter.DotnetCoreBlobFeed); + NuGetConfigWriter.Write(testAsset.TestRoot); var buildCommand = new BuildCommand(testAsset); diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs index 7b6142541113..64b968440c15 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs @@ -86,7 +86,7 @@ private CommandResult GenerateDepsAndRunTool(TestProject toolProject, [CallerMem var toolProjectInstance = _testAssetsManager.CreateTestProject(toolProject, callingMethod, identifier: toolProject.Name); - NuGetConfigWriter.Write(toolProjectInstance.TestRoot, NuGetConfigWriter.DotnetCoreBlobFeed); + NuGetConfigWriter.Write(toolProjectInstance.TestRoot); // Workaround https://github.com/dotnet/cli/issues/9701 var useBundledNETCoreAppPackage = "/p:UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion=true"; @@ -116,7 +116,7 @@ private CommandResult GenerateDepsAndRunTool(TestProject toolProject, [CallerMem new XAttribute("Version", "1.0.0"))); }); - List sources = new() { NuGetConfigWriter.DotnetCoreBlobFeed }; + List sources = new(); sources.Add(nupkgPath); NuGetConfigWriter.Write(toolReferencerInstance.TestRoot, sources); diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs index b315e318c856..50f5aedad51b 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs @@ -133,7 +133,7 @@ public void store_nativeonlyassets() var OutputFolder = Path.Combine(simpleDependenciesAsset.TestRoot, "outdir"); var WorkingDir = Path.Combine(simpleDependenciesAsset.TestRoot, "w"); - NuGetConfigWriter.Write(simpleDependenciesAsset.TestRoot, NuGetConfigWriter.DotnetCoreBlobFeed); + NuGetConfigWriter.Write(simpleDependenciesAsset.TestRoot); storeCommand .Execute($"/p:RuntimeIdentifier={_runtimeRid}", $"/p:TargetFramework={_tfm}", $"/p:ComposeWorkingDir={WorkingDir}", $"/p:ComposeDir={OutputFolder}", $"/p:DoNotDecorateComposeDir=true") diff --git a/test/Microsoft.NET.Restore.Tests/GivenThatWeWantToIgnoreObsoleteDotNetCliToolPackages.cs b/test/Microsoft.NET.Restore.Tests/GivenThatWeWantToIgnoreObsoleteDotNetCliToolPackages.cs index 9b21f3bbd9f2..1d771c714cb5 100644 --- a/test/Microsoft.NET.Restore.Tests/GivenThatWeWantToIgnoreObsoleteDotNetCliToolPackages.cs +++ b/test/Microsoft.NET.Restore.Tests/GivenThatWeWantToIgnoreObsoleteDotNetCliToolPackages.cs @@ -34,7 +34,7 @@ public void It_issues_warning_and_skips_restore_for_obsolete_DotNetCliToolRefere new XAttribute("Include", obsoletePackageId))); }); - NuGetConfigWriter.Write(toolProjectInstance.TestRoot, NuGetConfigWriter.DotnetCoreBlobFeed); + NuGetConfigWriter.Write(toolProjectInstance.TestRoot); RestoreCommand restoreCommand = toolProjectInstance.GetRestoreCommand(Log, toolProject.Name); restoreCommand.Execute("/v:n").Should() diff --git a/test/Microsoft.NET.Restore.Tests/GivenThatWeWantToRestoreDotNetCliToolReference.cs b/test/Microsoft.NET.Restore.Tests/GivenThatWeWantToRestoreDotNetCliToolReference.cs index d702b78c096f..ca58a5f9b6b1 100644 --- a/test/Microsoft.NET.Restore.Tests/GivenThatWeWantToRestoreDotNetCliToolReference.cs +++ b/test/Microsoft.NET.Restore.Tests/GivenThatWeWantToRestoreDotNetCliToolReference.cs @@ -50,7 +50,7 @@ public void It_can_restore_with_netcoreapp2_2() DeleteFolder(Path.Combine(TestContext.Current.NuGetCachePath, toolProject.Name.ToLowerInvariant())); DeleteFolder(Path.Combine(TestContext.Current.NuGetCachePath, ".tools", toolProject.Name.ToLowerInvariant())); - NuGetConfigWriter.Write(toolReferenceProjectInstance.TestRoot, NuGetConfigWriter.DotnetCoreBlobFeed, nupkgPath); + NuGetConfigWriter.Write(toolReferenceProjectInstance.TestRoot, nupkgPath); RestoreCommand restoreCommand = toolReferenceProjectInstance.GetRestoreCommand(log: Log, relativePath: toolReferenceProject.Name); diff --git a/test/Microsoft.NET.TestFramework/NuGetConfigWriter.cs b/test/Microsoft.NET.TestFramework/NuGetConfigWriter.cs index bf27fe23956f..6e90aa618904 100644 --- a/test/Microsoft.NET.TestFramework/NuGetConfigWriter.cs +++ b/test/Microsoft.NET.TestFramework/NuGetConfigWriter.cs @@ -5,7 +5,6 @@ namespace Microsoft.NET.TestFramework { public static class NuGetConfigWriter { - public static readonly string DotnetCoreBlobFeed = "https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json"; public static readonly string AspNetCoreDevFeed = "https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json"; public static void Write(string folder, params string[] nugetSources) From 566ab59f6105bd57228db5bd43d1d8f99f34e399 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 11 Dec 2024 14:45:37 -0800 Subject: [PATCH 3/6] Disable the nullable warnings specifically --- Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 6db39856dfc1..cc4e6cd24fea 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -9,7 +9,7 @@ We still check $(TargetFrameworks) for empty though, because for single-targeted builds we want to allow nullable warnings regardless of target framework. --> - true + $(NoWarn);Nullable From 8330623325eb4db2b970d049041fa0cf2033b758 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 11 Dec 2024 15:11:28 -0800 Subject: [PATCH 4/6] Update template baselines --- ....BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt | 2 ++ ...ts.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt | 2 ++ ...asicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt | 2 ++ ...ListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt | 2 ++ ...ewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt | 2 ++ ...stTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt | 2 ++ 6 files changed, 12 insertions(+) diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt index 5c619748b23f..226476b58a65 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt @@ -13,6 +13,8 @@ ASP.NET Core Web API webapi [C#] ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages +ASP.NET Core with Angular angular [C#] Web/MVC/SPA +ASP.NET Core with React.js react [C#] Web/MVC/SPA Blazor Server App blazorserver [C#] Web/Blazor Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt index 5c619748b23f..226476b58a65 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt @@ -13,6 +13,8 @@ ASP.NET Core Web API webapi [C#] ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages +ASP.NET Core with Angular angular [C#] Web/MVC/SPA +ASP.NET Core with React.js react [C#] Web/MVC/SPA Blazor Server App blazorserver [C#] Web/Blazor Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt index a5d4946c1ac8..1fe60f0aa5e8 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt @@ -13,6 +13,8 @@ ASP.NET Core Web API webapi [C#] ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages +ASP.NET Core with Angular angular [C#] Web/MVC/SPA +ASP.NET Core with React.js react [C#] Web/MVC/SPA Blazor Server App blazorserver [C#] Web/Blazor Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt index 5f864b5ef228..5fc37ac5c805 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt @@ -9,6 +9,8 @@ ASP.NET Core Web API webapi [C#] ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages +ASP.NET Core with Angular angular [C#] Web/MVC/SPA +ASP.NET Core with React.js react [C#] Web/MVC/SPA Blazor Server App blazorserver [C#] Web/Blazor Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt index 5f864b5ef228..5fc37ac5c805 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt @@ -9,6 +9,8 @@ ASP.NET Core Web API webapi [C#] ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages +ASP.NET Core with Angular angular [C#] Web/MVC/SPA +ASP.NET Core with React.js react [C#] Web/MVC/SPA Blazor Server App blazorserver [C#] Web/Blazor Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt index f183ab893b52..69b57045d8be 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt @@ -9,6 +9,8 @@ ASP.NET Core Web API webapi [C#] ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages +ASP.NET Core with Angular angular [C#] Web/MVC/SPA +ASP.NET Core with React.js react [C#] Web/MVC/SPA Blazor Server App blazorserver [C#] Web/Blazor Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA From 92bd3c414e890e39c1a3290b591fd46cc5326941 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 11 Dec 2024 18:52:47 -0800 Subject: [PATCH 5/6] Fix template test failures --- ....BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt | 2 -- ...ts.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt | 2 -- ...asicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt | 2 -- ...ListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt | 2 -- ...ewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt | 2 -- ...stTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt | 2 -- 6 files changed, 12 deletions(-) diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt index 226476b58a65..5c619748b23f 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt @@ -13,8 +13,6 @@ ASP.NET Core Web API webapi [C#] ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages -ASP.NET Core with Angular angular [C#] Web/MVC/SPA -ASP.NET Core with React.js react [C#] Web/MVC/SPA Blazor Server App blazorserver [C#] Web/Blazor Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt index 226476b58a65..5c619748b23f 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt @@ -13,8 +13,6 @@ ASP.NET Core Web API webapi [C#] ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages -ASP.NET Core with Angular angular [C#] Web/MVC/SPA -ASP.NET Core with React.js react [C#] Web/MVC/SPA Blazor Server App blazorserver [C#] Web/Blazor Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt index 1fe60f0aa5e8..a5d4946c1ac8 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt @@ -13,8 +13,6 @@ ASP.NET Core Web API webapi [C#] ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages -ASP.NET Core with Angular angular [C#] Web/MVC/SPA -ASP.NET Core with React.js react [C#] Web/MVC/SPA Blazor Server App blazorserver [C#] Web/Blazor Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt index 5fc37ac5c805..5f864b5ef228 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt @@ -9,8 +9,6 @@ ASP.NET Core Web API webapi [C#] ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages -ASP.NET Core with Angular angular [C#] Web/MVC/SPA -ASP.NET Core with React.js react [C#] Web/MVC/SPA Blazor Server App blazorserver [C#] Web/Blazor Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt index 5fc37ac5c805..5f864b5ef228 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt @@ -9,8 +9,6 @@ ASP.NET Core Web API webapi [C#] ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages -ASP.NET Core with Angular angular [C#] Web/MVC/SPA -ASP.NET Core with React.js react [C#] Web/MVC/SPA Blazor Server App blazorserver [C#] Web/Blazor Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt index 69b57045d8be..f183ab893b52 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt @@ -9,8 +9,6 @@ ASP.NET Core Web API webapi [C#] ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages -ASP.NET Core with Angular angular [C#] Web/MVC/SPA -ASP.NET Core with React.js react [C#] Web/MVC/SPA Blazor Server App blazorserver [C#] Web/Blazor Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA From a3619aece48fd2beb180f72541f64673ff5b12ac Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 12 Dec 2024 14:58:49 -0800 Subject: [PATCH 6/6] Remove the unmanaged store test as it requires a package we no longer have easy access to --- ...atWeWantToStoreAProjectWithDependencies.cs | 31 ------------------- .../UnmanagedStore/UnmanagedStore.csproj | 7 ----- 2 files changed, 38 deletions(-) delete mode 100644 test/TestAssets/TestProjects/UnmanagedStore/UnmanagedStore.csproj diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs index 50f5aedad51b..9f75c4be174d 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs @@ -121,37 +121,6 @@ public void compose_dependencies_noopt() storeDirectory.Should().OnlyHaveFiles(files_on_disk); } - [Fact] - public void store_nativeonlyassets() - { - TestAsset simpleDependenciesAsset = _testAssetsManager - .CopyTestAsset("UnmanagedStore") - .WithSource(); - - var storeCommand = new ComposeStoreCommand(Log, simpleDependenciesAsset.TestRoot); - - var OutputFolder = Path.Combine(simpleDependenciesAsset.TestRoot, "outdir"); - var WorkingDir = Path.Combine(simpleDependenciesAsset.TestRoot, "w"); - - NuGetConfigWriter.Write(simpleDependenciesAsset.TestRoot); - - storeCommand - .Execute($"/p:RuntimeIdentifier={_runtimeRid}", $"/p:TargetFramework={_tfm}", $"/p:ComposeWorkingDir={WorkingDir}", $"/p:ComposeDir={OutputFolder}", $"/p:DoNotDecorateComposeDir=true") - .Should() - .Pass(); - - DirectoryInfo storeDirectory = new(OutputFolder); - - List files_on_disk = new() - { - "artifact.xml", - $"runtime.{_runtimeRid}.microsoft.netcore.coredistools/1.0.1-prerelease-00001/runtimes/{_runtimeRid}/native/{_libPrefix}coredistools{FileConstants.DynamicLibSuffix}", - $"runtime.{_runtimeRid}.microsoft.netcore.coredistools/1.0.1-prerelease-00001/runtimes/{_runtimeRid}/native/coredistools.h" - }; - - storeDirectory.Should().OnlyHaveFiles(files_on_disk); - } - [Fact] public void compose_multifile() { diff --git a/test/TestAssets/TestProjects/UnmanagedStore/UnmanagedStore.csproj b/test/TestAssets/TestProjects/UnmanagedStore/UnmanagedStore.csproj deleted file mode 100644 index 97c34181d373..000000000000 --- a/test/TestAssets/TestProjects/UnmanagedStore/UnmanagedStore.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - -