diff --git a/Directory.Build.targets b/Directory.Build.targets index eb3a879221b8..cc4e6cd24fea 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,6 +1,16 @@ + + + $(NoWarn);Nullable + 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()); 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..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, NuGetConfigWriter.DotnetCoreBlobFeed); - - 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/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) 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 @@ - - - - - - -