diff --git a/eng/Versions.props b/eng/Versions.props index 4c7d427f88e0..faca990688d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,31 @@ $(MajorVersion).$(MinorVersion) $(MajorVersion).$(MinorVersion) netcoreapp$(NETCoreAppFrameworkVersion) + + 1 + + + + + + + 1.0.0-beta.18619.4 diff --git a/src/pkg/packaging-tools/framework.packaging.targets b/src/pkg/packaging-tools/framework.packaging.targets index 1ef58a75a574..62b684ad56d9 100644 --- a/src/pkg/packaging-tools/framework.packaging.targets +++ b/src/pkg/packaging-tools/framework.packaging.targets @@ -35,6 +35,17 @@ + + + false + false + false + false + + + + + + %(CurrentProjectServicingConfiguration.PatchVersion) + $(MostRecentProducedServicingPatchVersion) + + + + + + + true + + <_packageRIDInBuildRIDList Condition="'%(BuildRID.Identity)' == '$(PackageRID)'">true diff --git a/src/pkg/projects/netstandard/pkg/Directory.Build.props b/src/pkg/projects/netstandard/pkg/Directory.Build.props index 5f001b51e7e8..f913a01c9476 100644 --- a/src/pkg/projects/netstandard/pkg/Directory.Build.props +++ b/src/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/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs b/src/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs index dcd8539f5b73..244db204b19a 100644 --- a/src/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs +++ b/src/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs @@ -14,10 +14,16 @@ 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 for servicing builds. + if (tester == null) + { + return; + } + tester.IsTargetingPackForPlatform(); tester.HasOnlyTheseDataFiles( "data/FrameworkList.xml", diff --git a/src/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs b/src/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs index 893a4c4342a5..8dc9e9d5eed2 100644 --- a/src/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs +++ b/src/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs @@ -14,10 +14,16 @@ 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 for servicing builds. + if (tester == null) + { + return; + } + tester.HasOnlyTheseDataFiles( "data/FrameworkList.xml", "data/PackageOverrides.txt"); diff --git a/src/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/WindowsDesktopTests.cs b/src/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/WindowsDesktopTests.cs index 437739950073..e443a8720d20 100644 --- a/src/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/WindowsDesktopTests.cs +++ b/src/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/WindowsDesktopTests.cs @@ -25,7 +25,11 @@ public void WindowsDesktopTargetingPackIsValid() { if (CurrentRidShouldCreateNupkg) { - Assert.NotNull(tester); + // Allow no targeting pack for servicing builds. + if (tester == null) + { + return; + } tester.IsTargetingPackForPlatform(); tester.HasOnlyTheseDataFiles(