Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project>
<PropertyGroup>
<!-- The .NET product branding version -->
<ProductVersion>6.0.1</ProductVersion>
<ProductVersion>6.0.2</ProductVersion>
<!-- File version numbers -->
<MajorVersion>6</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>1</PatchVersion>
<PatchVersion>2</PatchVersion>
<SdkBandVersion>6.0.100</SdkBandVersion>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration></PreReleaseVersionIteration>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public void NETCoreTargetingPackIsValid()
"Microsoft.NETCore.App.Ref"))
{
// Allow no targeting pack in case this is a servicing build.
// This condition should be tightened: https://github.com/dotnet/core-setup/issues/8830
// This condition should be tightened: https://github.com/dotnet/runtime/issues/3836
if (tester == null)
{
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,7 @@ public static NuGetArtifactTester OpenOrNull(
"Shipping",
$"{id}.{dirs.MicrosoftNETCoreAppVersion}.nupkg");

// If the nuspec exists, the nupkg should exist.
Assert.True(File.Exists(nupkgPath));

return new NuGetArtifactTester(nupkgPath);
return File.Exists(nupkgPath) ? new NuGetArtifactTester(nupkgPath) : null;
}

public PackageIdentity Identity { get; }
Expand Down