Skip to content

Commit 0113afe

Browse files
Fix a set of test issues caused by an old blob feed and try to fix up the nullable change we rushed in (#45420)
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
1 parent 9e7011b commit 0113afe

File tree

10 files changed

+20
-48
lines changed

10 files changed

+20
-48
lines changed

Directory.Build.targets

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
33
<Project>
4+
<PropertyGroup>
5+
<!--
6+
Disable nullable warnings when targeting anything other than our supported .NET core version(s).
7+
This condition will be evaluated multiple times in multi-targeted projects hence need to be careful
8+
to only set in the inner builds, not the outer build where only $(TargetFrameworks) is defined.
9+
We still check $(TargetFrameworks) for empty though, because for single-targeted builds we want to
10+
allow nullable warnings regardless of target framework.
11+
-->
12+
<NoWarn Condition="'$(DisableNullableWarnings)' == '' AND '$(TargetFrameworks)' != '' AND '$(TargetFramework)' != '' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">$(NoWarn);Nullable</NoWarn>
13+
</PropertyGroup>
414

515
<ItemGroup>
616
<SupportedPlatform Remove="Android" />

src/Cli/Microsoft.DotNet.Cli.Utils/Command.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,12 @@ public CommandResult Execute(Action<Process>? processStarted)
7474

7575
if (CommandLoggingContext.IsVerbose)
7676
{
77+
Debug.Assert(sw is not null);
7778
var message = string.Format(
7879
LocalizableStrings.ProcessExitedWithCode,
7980
FormatProcessInfo(_process.StartInfo),
8081
exitCode,
81-
sw?.ElapsedMilliseconds);
82+
sw.ElapsedMilliseconds);
8283
if (exitCode == 0)
8384
{
8485
Reporter.Verbose.WriteLine(message.Green());

test/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void CanBuildProjectWithPackageReferencesWithConflictingTypes()
3939
var testAsset = _testAssetsManager.CreateTestProject(testProject);
4040

4141
var packagesPaths = packageReferences.Select(e => Path.GetDirectoryName(e.NupkgPath));
42-
List<string> sources = new() { NuGetConfigWriter.DotnetCoreBlobFeed };
42+
List<string> sources = new();
4343
sources.AddRange(packagesPaths);
4444
NuGetConfigWriter.Write(testAsset.TestRoot, sources);
4545

@@ -85,7 +85,7 @@ public void CanBuildProjectWithMultiplePackageReferencesWithAliases()
8585
testProject.SourceFiles[$"{testProject.Name}.cs"] = ClassLibAandBUsage;
8686
var testAsset = _testAssetsManager.CreateTestProject(testProject);
8787

88-
List<string> sources = new() { NuGetConfigWriter.DotnetCoreBlobFeed, Path.GetDirectoryName(packageReferenceA.NupkgPath), Path.GetDirectoryName(packageReferenceB.NupkgPath) };
88+
List<string> sources = new() { Path.GetDirectoryName(packageReferenceA.NupkgPath), Path.GetDirectoryName(packageReferenceB.NupkgPath) };
8989
NuGetConfigWriter.Write(testAsset.TestRoot, sources);
9090

9191
var buildCommand = new BuildCommand(testAsset)
@@ -122,7 +122,7 @@ public void CanBuildProjectWithAPackageReferenceWithMultipleAliases()
122122
testProject.SourceFiles[$"{testProject.Name}.cs"] = ClassLibAandBUsage;
123123
var testAsset = _testAssetsManager.CreateTestProject(testProject);
124124

125-
List<string> sources = new() { NuGetConfigWriter.DotnetCoreBlobFeed, Path.GetDirectoryName(packageReferenceA.NupkgPath) };
125+
List<string> sources = new() { Path.GetDirectoryName(packageReferenceA.NupkgPath) };
126126
NuGetConfigWriter.Write(testAsset.TestRoot, sources);
127127

128128
var buildCommand = new BuildCommand(testAsset)

test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ private void It_targets_the_right_framework(
133133

134134
var testAsset = _testAssetsManager.CreateTestProject(testProject, testIdentifier);
135135

136-
NuGetConfigWriter.Write(testAsset.TestRoot, NuGetConfigWriter.DotnetCoreBlobFeed);
136+
NuGetConfigWriter.Write(testAsset.TestRoot);
137137

138138
var buildCommand = new BuildCommand(testAsset);
139139

test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private CommandResult GenerateDepsAndRunTool(TestProject toolProject, [CallerMem
8686

8787
var toolProjectInstance = _testAssetsManager.CreateTestProject(toolProject, callingMethod, identifier: toolProject.Name);
8888

89-
NuGetConfigWriter.Write(toolProjectInstance.TestRoot, NuGetConfigWriter.DotnetCoreBlobFeed);
89+
NuGetConfigWriter.Write(toolProjectInstance.TestRoot);
9090

9191
// Workaround https://github.com/dotnet/cli/issues/9701
9292
var useBundledNETCoreAppPackage = "/p:UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion=true";
@@ -116,7 +116,7 @@ private CommandResult GenerateDepsAndRunTool(TestProject toolProject, [CallerMem
116116
new XAttribute("Version", "1.0.0")));
117117
});
118118

119-
List<string> sources = new() { NuGetConfigWriter.DotnetCoreBlobFeed };
119+
List<string> sources = new();
120120
sources.Add(nupkgPath);
121121

122122
NuGetConfigWriter.Write(toolReferencerInstance.TestRoot, sources);

test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -121,37 +121,6 @@ public void compose_dependencies_noopt()
121121
storeDirectory.Should().OnlyHaveFiles(files_on_disk);
122122
}
123123

124-
[Fact]
125-
public void store_nativeonlyassets()
126-
{
127-
TestAsset simpleDependenciesAsset = _testAssetsManager
128-
.CopyTestAsset("UnmanagedStore")
129-
.WithSource();
130-
131-
var storeCommand = new ComposeStoreCommand(Log, simpleDependenciesAsset.TestRoot);
132-
133-
var OutputFolder = Path.Combine(simpleDependenciesAsset.TestRoot, "outdir");
134-
var WorkingDir = Path.Combine(simpleDependenciesAsset.TestRoot, "w");
135-
136-
NuGetConfigWriter.Write(simpleDependenciesAsset.TestRoot, NuGetConfigWriter.DotnetCoreBlobFeed);
137-
138-
storeCommand
139-
.Execute($"/p:RuntimeIdentifier={_runtimeRid}", $"/p:TargetFramework={_tfm}", $"/p:ComposeWorkingDir={WorkingDir}", $"/p:ComposeDir={OutputFolder}", $"/p:DoNotDecorateComposeDir=true")
140-
.Should()
141-
.Pass();
142-
143-
DirectoryInfo storeDirectory = new(OutputFolder);
144-
145-
List<string> files_on_disk = new()
146-
{
147-
"artifact.xml",
148-
$"runtime.{_runtimeRid}.microsoft.netcore.coredistools/1.0.1-prerelease-00001/runtimes/{_runtimeRid}/native/{_libPrefix}coredistools{FileConstants.DynamicLibSuffix}",
149-
$"runtime.{_runtimeRid}.microsoft.netcore.coredistools/1.0.1-prerelease-00001/runtimes/{_runtimeRid}/native/coredistools.h"
150-
};
151-
152-
storeDirectory.Should().OnlyHaveFiles(files_on_disk);
153-
}
154-
155124
[Fact]
156125
public void compose_multifile()
157126
{

test/Microsoft.NET.Restore.Tests/GivenThatWeWantToIgnoreObsoleteDotNetCliToolPackages.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void It_issues_warning_and_skips_restore_for_obsolete_DotNetCliToolRefere
3434
new XAttribute("Include", obsoletePackageId)));
3535
});
3636

37-
NuGetConfigWriter.Write(toolProjectInstance.TestRoot, NuGetConfigWriter.DotnetCoreBlobFeed);
37+
NuGetConfigWriter.Write(toolProjectInstance.TestRoot);
3838

3939
RestoreCommand restoreCommand = toolProjectInstance.GetRestoreCommand(Log, toolProject.Name);
4040
restoreCommand.Execute("/v:n").Should()

test/Microsoft.NET.Restore.Tests/GivenThatWeWantToRestoreDotNetCliToolReference.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void It_can_restore_with_netcoreapp2_2()
5050

5151
DeleteFolder(Path.Combine(TestContext.Current.NuGetCachePath, toolProject.Name.ToLowerInvariant()));
5252
DeleteFolder(Path.Combine(TestContext.Current.NuGetCachePath, ".tools", toolProject.Name.ToLowerInvariant()));
53-
NuGetConfigWriter.Write(toolReferenceProjectInstance.TestRoot, NuGetConfigWriter.DotnetCoreBlobFeed, nupkgPath);
53+
NuGetConfigWriter.Write(toolReferenceProjectInstance.TestRoot, nupkgPath);
5454

5555
RestoreCommand restoreCommand =
5656
toolReferenceProjectInstance.GetRestoreCommand(log: Log, relativePath: toolReferenceProject.Name);

test/Microsoft.NET.TestFramework/NuGetConfigWriter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ namespace Microsoft.NET.TestFramework
55
{
66
public static class NuGetConfigWriter
77
{
8-
public static readonly string DotnetCoreBlobFeed = "https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json";
98
public static readonly string AspNetCoreDevFeed = "https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json";
109

1110
public static void Write(string folder, params string[] nugetSources)

test/TestAssets/TestProjects/UnmanagedStore/UnmanagedStore.csproj

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)