Skip to content

Commit cfb9e77

Browse files
Update branding to 6.0.2 (#62493)
* Update branding to 6.0.2 * Fix installer test when ref packs are not produced on servicing builds * Fix syntax Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com>
1 parent e9036b0 commit cfb9e77

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22
<PropertyGroup>
33
<!-- The .NET product branding version -->
4-
<ProductVersion>6.0.1</ProductVersion>
4+
<ProductVersion>6.0.2</ProductVersion>
55
<!-- File version numbers -->
66
<MajorVersion>6</MajorVersion>
77
<MinorVersion>0</MinorVersion>
8-
<PatchVersion>1</PatchVersion>
8+
<PatchVersion>2</PatchVersion>
99
<SdkBandVersion>6.0.100</SdkBandVersion>
1010
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
1111
<PreReleaseVersionIteration></PreReleaseVersionIteration>

src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public void NETCoreTargetingPackIsValid()
1818
"Microsoft.NETCore.App.Ref"))
1919
{
2020
// Allow no targeting pack in case this is a servicing build.
21-
// This condition should be tightened: https://github.com/dotnet/core-setup/issues/8830
21+
// This condition should be tightened: https://github.com/dotnet/runtime/issues/3836
2222
if (tester == null)
2323
{
2424
return;

src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,7 @@ public static NuGetArtifactTester OpenOrNull(
4141
"Shipping",
4242
$"{id}.{dirs.MicrosoftNETCoreAppVersion}.nupkg");
4343

44-
// If the nuspec exists, the nupkg should exist.
45-
Assert.True(File.Exists(nupkgPath));
46-
47-
return new NuGetArtifactTester(nupkgPath);
44+
return File.Exists(nupkgPath) ? new NuGetArtifactTester(nupkgPath) : null;
4845
}
4946

5047
public PackageIdentity Identity { get; }

0 commit comments

Comments
 (0)