diff --git a/Documentation/building/testing-with-corefx.md b/Documentation/building/testing-with-corefx.md
index b2c7d4d21df4..b7e55275a7f7 100644
--- a/Documentation/building/testing-with-corefx.md
+++ b/Documentation/building/testing-with-corefx.md
@@ -155,10 +155,10 @@ For Linux and macOS:
The published tests are summarized in a `corefx-test-assets.xml` file that lives here:
```
-https://dotnetfeed.blob.core.windows.net/dotnet-core/corefx-tests/$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)/$(__BuildOS).$(__BuildArch)/$(_TargetGroup)/corefx-test-assets.xml
+https://dotnetfeed.blob.core.windows.net/dotnet-core/corefx-tests/$(MicrosoftPrivateCoreFxNETCoreAppVersion)/$(__BuildOS).$(__BuildArch)/$(_TargetGroup)/corefx-test-assets.xml
```
-where `MicrosoftPrivateCoreFxNETCoreAppPackageVersion` is defined in `eng\Versions.props`. For example:
+where `MicrosoftPrivateCoreFxNETCoreAppVersion` is defined in `eng\Versions.props`. For example:
```
https://dotnetfeed.blob.core.windows.net/dotnet-core/corefx-tests/4.6.0-preview8.19326.15/Linux.arm64/netcoreapp/corefx-test-assets.xml
diff --git a/eng/Versions.props b/eng/Versions.props
index cd56573778dc..62ffe70e7452 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,20 +20,20 @@
2.5.1-beta.19278.1
1.0.0-beta.19463.3
- 5.0.0-alpha.1.19531.1
+ 5.0.0-alpha.1.19531.1
5.0.0-alpha.1.19531.1
- 1.0.0-preview7.19326.2
5.0.0-alpha1.19527.2
99.99.99-master-20190716.1
99.99.99-master-20190716.1
- 5.0.0-alpha1.19413.7
+ 5.0.0-alpha1.19413.7
+ $(MicrosoftNETCoreILAsmVersion)
- Microsoft.DotNet.XUnitConsoleRunner
+ microsoft.dotnet.xunitconsolerunner
Microsoft.Private.CoreFx.NETCoreApp
Microsoft.NETCore.Platforms
Microsoft.NETCore.App
diff --git a/eng/helixcorefxtests.proj b/eng/helixcorefxtests.proj
index 923c7776ce7a..b335ab42a429 100644
--- a/eng/helixcorefxtests.proj
+++ b/eng/helixcorefxtests.proj
@@ -195,7 +195,7 @@
<_TargetGroup>netcoreapp
- <_AssetManifestPath>$(TestAssetBlobFeedUrl)/corefx-tests/$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)/$(__BuildOS).$(__BuildArch)/$(_TargetGroup)/corefx-test-assets.xml
+ <_AssetManifestPath>$(TestAssetBlobFeedUrl)/corefx-tests/$(MicrosoftPrivateCoreFxNETCoreAppVersion)/$(__BuildOS).$(__BuildArch)/$(_TargetGroup)/corefx-test-assets.xml
diff --git a/src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets b/src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets
index d84eee42aec3..299511fa2a8b 100644
--- a/src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets
+++ b/src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets
@@ -27,7 +27,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<_OSArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)
$(_OSPlatform)-$(_OSArchitecture.ToLower())
- 5.0.0
+ 5.0.0
runtime.$(MicrosoftNetCoreIlasmPackageRuntimeId).microsoft.netcore.ilasm
runtime.$(MicrosoftNetCoreIlasmPackageRuntimeId).microsoft.netcore.ildasm
@@ -39,8 +39,8 @@ Copyright (c) .NET Foundation. All rights reserved.
- <_IlasmPackageReference Include="$(MicrosoftNetCoreIlasmPackageName)" Version="$(MicrosoftNetCoreIlasmPackageVersion)" />
- <_IlasmPackageReference Include="$(MicrosoftNetCoreIldasmPackageName)" Version="$(MicrosoftNetCoreIlasmPackageVersion)" />
+ <_IlasmPackageReference Include="$(MicrosoftNetCoreIlasmPackageName)" Version="$(MicrosoftNETCoreILAsmVersion)" />
+ <_IlasmPackageReference Include="$(MicrosoftNetCoreIldasmPackageName)" Version="$(MicrosoftNETCoreILAsmVersion)" />
diff --git a/tests/src/Common/CoreFX/CoreFX.csproj b/tests/src/Common/CoreFX/CoreFX.csproj
index 02c14daa1c5c..80a5b268488a 100644
--- a/tests/src/Common/CoreFX/CoreFX.csproj
+++ b/tests/src/Common/CoreFX/CoreFX.csproj
@@ -29,7 +29,7 @@
-
+
diff --git a/tests/src/Common/test_dependencies/test_dependencies.csproj b/tests/src/Common/test_dependencies/test_dependencies.csproj
index 6da41cfeadf3..795e033fbc8f 100644
--- a/tests/src/Common/test_dependencies/test_dependencies.csproj
+++ b/tests/src/Common/test_dependencies/test_dependencies.csproj
@@ -9,12 +9,12 @@
win-arm;win-arm64;win-x64;win-x86;$(TargetRid)
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj b/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj
index f43122e5fdd5..c8ac76c7ac12 100644
--- a/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj
+++ b/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj
@@ -25,7 +25,7 @@
- $(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)
+ $(MicrosoftPrivateCoreFxNETCoreAppVersion)
diff --git a/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj b/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj
index a890f89f4131..4eb81d9bd4f1 100644
--- a/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj
+++ b/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj
@@ -11,10 +11,10 @@
- $(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)
+ $(MicrosoftPrivateCoreFxNETCoreAppVersion)
- $(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)
+ $(MicrosoftPrivateCoreFxNETCoreAppVersion)
diff --git a/tests/src/JIT/config/benchmark/benchmark.csproj b/tests/src/JIT/config/benchmark/benchmark.csproj
index 530c44846eb8..b4b2b6427aed 100644
--- a/tests/src/JIT/config/benchmark/benchmark.csproj
+++ b/tests/src/JIT/config/benchmark/benchmark.csproj
@@ -56,13 +56,13 @@
4.4.0-beta-24913-02
- $(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)
+ $(MicrosoftPrivateCoreFxNETCoreAppVersion)
4.4.0-beta-24913-02
- $(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)
+ $(MicrosoftPrivateCoreFxNETCoreAppVersion)
4.4.0-beta-24913-02
diff --git a/tests/src/helixpublishwitharcade.proj b/tests/src/helixpublishwitharcade.proj
index 61af68f15648..27dd136fe67b 100644
--- a/tests/src/helixpublishwitharcade.proj
+++ b/tests/src/helixpublishwitharcade.proj
@@ -124,7 +124,7 @@
- <_XUnitConsoleRunnerFiles Include="$(NuGetPackageRoot)$(MicrosoftDotNetXUnitConsoleRunnerPackage.ToLower())\$(MicrosoftDotNetXUnitConsoleRunnerVersion)\**\xunit.console.*" />
+ <_XUnitConsoleRunnerFiles Include="$(NuGetPackageRoot)$(MicrosoftDotNetXUnitConsoleRunnerPackage)\$(MicrosoftDotNetXUnitConsoleRunnerVersion)\**\xunit.console.*" />
diff --git a/tests/src/performance/Scenario/JitBench/JitBench.csproj b/tests/src/performance/Scenario/JitBench/JitBench.csproj
index 8f93cb5d598f..7a8bea2a27e3 100644
--- a/tests/src/performance/Scenario/JitBench/JitBench.csproj
+++ b/tests/src/performance/Scenario/JitBench/JitBench.csproj
@@ -33,7 +33,7 @@
-
+
diff --git a/tests/src/performance/Scenario/JitBench/Runner/Program.cs b/tests/src/performance/Scenario/JitBench/Runner/Program.cs
index bd664e1e2310..015838d4b8cf 100644
--- a/tests/src/performance/Scenario/JitBench/Runner/Program.cs
+++ b/tests/src/performance/Scenario/JitBench/Runner/Program.cs
@@ -37,7 +37,7 @@ static TestRun ConfigureTestRun(CommandLineOptions options)
TestRun run = new TestRun()
{
OutputDir = GetInitialWorkingDir(),
- DotnetFrameworkVersion = JitBench.VersioningConstants.MicrosoftNetCoreAppPackageVersion,
+ DotnetFrameworkVersion = JitBench.VersioningConstants.MicrosoftNETCoreAppVersion,
Iterations = 11
};
diff --git a/tests/src/performance/Scenario/JitBench/unofficial_dotnet/JitBench.csproj b/tests/src/performance/Scenario/JitBench/unofficial_dotnet/JitBench.csproj
index 4764b9e3d6cc..32436b972869 100644
--- a/tests/src/performance/Scenario/JitBench/unofficial_dotnet/JitBench.csproj
+++ b/tests/src/performance/Scenario/JitBench/unofficial_dotnet/JitBench.csproj
@@ -40,7 +40,7 @@
-
+
diff --git a/tests/src/performance/performance.csproj b/tests/src/performance/performance.csproj
index fd937a1bb453..684a39863103 100644
--- a/tests/src/performance/performance.csproj
+++ b/tests/src/performance/performance.csproj
@@ -48,7 +48,7 @@
4.4.0-beta-24913-02
- $(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)
+ $(MicrosoftPrivateCoreFxNETCoreAppVersion)
4.4.0-beta-24913-02