diff --git a/Directory.Build.props b/Directory.Build.props
index 3adc325eaf..47f3188693 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -84,11 +84,11 @@
aspnetcore-runtime
aspnetcore-targeting-pack
-
-
+
+
false
true
+ Condition=" '$(IsTargetingPackBuilding)' == '' AND '$(VersionPrefix)' == '3.1.3' ">true
false
true
diff --git a/eng/SharedFramework.External.props b/eng/SharedFramework.External.props
index 8fdebc787d..e46f5c1120 100644
--- a/eng/SharedFramework.External.props
+++ b/eng/SharedFramework.External.props
@@ -6,6 +6,19 @@
-->
+
+
+ $(SystemIOPipelinesPackageVersion.Split('.')[0]).$(SystemIOPipelinesPackageVersion.Split('.')[1]).0
+ $(SystemSecurityCryptographyXmlPackageVersion.Split('.')[0]).$(SystemSecurityCryptographyXmlPackageVersion.Split('.')[1]).0
+ $(MicrosoftWin32SystemEventsPackageVersion.Split('.')[0]).$(MicrosoftWin32SystemEventsPackageVersion.Split('.')[1]).0
+ $(SystemDiagnosticsEventLogPackageVersion.Split('.')[0]).$(SystemDiagnosticsEventLogPackageVersion.Split('.')[1]).0
+ $(SystemDrawingCommonPackageVersion.Split('.')[0]).$(SystemDrawingCommonPackageVersion.Split('.')[1]).0
+ $(SystemSecurityCryptographyPkcsPackageVersion.Split('.')[0]).$(SystemSecurityCryptographyPkcsPackageVersion.Split('.')[1]).0
+ $(SystemSecurityPermissionsPackageVersion.Split('.')[0]).$(SystemSecurityPermissionsPackageVersion.Split('.')[1]).0
+ $(SystemWindowsExtensionsPackageVersion.Split('.')[0]).$(SystemWindowsExtensionsPackageVersion.Split('.')[1]).0
+
+
+
diff --git a/eng/Versions.props b/eng/Versions.props
index 52c572ebf9..c4d0ef2744 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -33,7 +33,7 @@
$(VersionPrefix)
- $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).2
+ $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).3
0.3.$(AspNetCorePatchVersion)
$([MSBuild]::Add(10, $(AspNetCoreMajorVersion)))
diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj
index 1f2a51901d..46e82aa3b5 100644
--- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj
+++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj
@@ -9,7 +9,8 @@
$(TargetingPackName)
$(TargetingPackVersionPrefix)
- $(NoWarn);NU5128
+
+ $(NoWarn);NU5128;NU1605
Provides a default set of APIs for building an ASP.NET Core application. Contains reference assemblies, documentation, and other design-time assets.
@@ -130,7 +131,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
true
@@ -35,6 +36,10 @@
<_Parameter1>TargetingPackLayoutRoot
<_Parameter2>$(TargetingPackLayoutRoot)
+
+ <_Parameter1>VerifyAncmBinary
+ <_Parameter2>$(VerifyAncmBinary)
+
diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs
index 12672a210a..82b43cb831 100644
--- a/src/Framework/test/TargetingPackTests.cs
+++ b/src/Framework/test/TargetingPackTests.cs
@@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore
_targetingPackRoot = Path.Combine(TestData.GetTestDataValue("TargetingPackLayoutRoot"), "packs", "Microsoft.AspNetCore.App.Ref", TestData.GetTestDataValue("TargetingPackVersion"));
}
- [Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")]
+ [Fact]
public void AssembliesAreReferenceAssemblies()
{
IEnumerable dlls = Directory.GetFiles(_targetingPackRoot, "*.dll", SearchOption.AllDirectories);
@@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore
});
}
- [Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")]
+ [Fact]
public void PlatformManifestListsAllFiles()
{
var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt");
@@ -90,6 +90,12 @@ namespace Microsoft.AspNetCore
})
.ToHashSet();
+ if (!TestData.VerifyAncmBinary())
+ {
+ actualAssemblies.Remove("aspnetcorev2_inprocess");
+ expectedAssemblies.Remove("aspnetcorev2_inprocess");
+ }
+
var missing = expectedAssemblies.Except(actualAssemblies);
var unexpected = actualAssemblies.Except(expectedAssemblies);
diff --git a/src/Framework/test/TestData.cs b/src/Framework/test/TestData.cs
index 594f7693a4..f087d9e16e 100644
--- a/src/Framework/test/TestData.cs
+++ b/src/Framework/test/TestData.cs
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+using System;
using System.Linq;
using System.Reflection;
@@ -20,6 +21,8 @@ namespace Microsoft.AspNetCore
public static string GetTargetingPackDependencies() => GetTestDataValue("TargetingPackDependencies");
+ public static bool VerifyAncmBinary() => string.Equals(GetTestDataValue("VerifyAncmBinary"), "true", StringComparison.OrdinalIgnoreCase);
+
public static string GetTestDataValue(string key)
=> typeof(TestData).Assembly.GetCustomAttributes().Single(d => d.Key == key).Value;
}