Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update branding to 6.0.2 #62493

Merged
merged 3 commits into from
Dec 8, 2021
Merged

Update branding to 6.0.2 #62493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74de3d9
Update branding to 6.0.2
vseanreesermsft Dec 7, 2021
8412896
Fix installer test when ref packs are not produced on servicing builds
safern Dec 7, 2021
59e46ad
Fix syntax
safern Dec 8, 2021
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs
View file
Open in desktop
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
5 changes: 1 addition & 4 deletions src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs
View file
Open in desktop
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