diff --git a/eng/Versions.props b/eng/Versions.props
index 60c5ebacc02e57..1964b0ff6aa79e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -30,7 +30,34 @@
$(MajorVersion).$(MinorVersion)
$(MajorVersion).$(MinorVersion)
netcoreapp$(NETCoreAppFrameworkVersion)
+
+ 0
+
+
+
+
+
+
+
+
5.0.0-beta.20071.3
diff --git a/src/installer/pkg/projects/netstandard/pkg/Directory.Build.props b/src/installer/pkg/projects/netstandard/pkg/Directory.Build.props
index dc717c60f78f12..2826aeac134c75 100644
--- a/src/installer/pkg/projects/netstandard/pkg/Directory.Build.props
+++ b/src/installer/pkg/projects/netstandard/pkg/Directory.Build.props
@@ -3,14 +3,14 @@
true
netstandard
Microsoft .NET Standard
-
- 2.1
- $(ProductBandVersion).0
+ 2.1
+ $(NETStandardPatchVersion)
+
.NET Standard 2.1
.NETStandard
2.1
diff --git a/src/installer/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs b/src/installer/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs
index dcd8539f5b733b..c4d5f7ae8117c6 100644
--- a/src/installer/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs
+++ b/src/installer/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs
@@ -14,10 +14,17 @@ public class NETCoreTests
[Fact]
public void NETCoreTargetingPackIsValid()
{
- using (var tester = NuGetArtifactTester.Open(
+ using (var tester = NuGetArtifactTester.OpenOrNull(
dirs,
"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
+ if (tester == null)
+ {
+ return;
+ }
+
tester.IsTargetingPackForPlatform();
tester.HasOnlyTheseDataFiles(
"data/FrameworkList.xml",
diff --git a/src/installer/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs b/src/installer/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs
index 893a4c4342a5f2..435ce8fc30a2a6 100644
--- a/src/installer/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs
+++ b/src/installer/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs
@@ -14,10 +14,17 @@ public class NETStandardTests
[Fact]
public void NETStandardTargetingPackIsValid()
{
- using (var tester = NuGetArtifactTester.Open(
+ using (var tester = NuGetArtifactTester.OpenOrNull(
dirs,
"NETStandard.Library.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
+ if (tester == null)
+ {
+ return;
+ }
+
tester.HasOnlyTheseDataFiles(
"data/FrameworkList.xml",
"data/PackageOverrides.txt");