diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
index 758e81ed5..8f6e579e7 100644
--- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
+++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
@@ -6,6 +6,7 @@
$(CliTargetFramework)
Exe
+ $(MicrosoftNETCoreAppPackageVersion)
diff --git a/TestAssets/TestProjects/TestAppSimple/Program.cs b/TestAssets/TestProjects/TestAppSimple/Program.cs
new file mode 100644
index 000000000..d431e919c
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppSimple/Program.cs
@@ -0,0 +1,23 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace ConsoleApplication
+{
+ public class Program
+ {
+ public static void Main(string[] args)
+ {
+ Console.WriteLine("Hello World!");
+
+ if (args.Length > 0)
+ {
+ for (int i = 0; i < args.Length; i++)
+ {
+ Console.WriteLine($"{i} = {args[i]}");
+ }
+ }
+ }
+ }
+}
diff --git a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
new file mode 100644
index 000000000..7f72f6294
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
@@ -0,0 +1,8 @@
+
+
+
+
+ netcoreapp2.2
+ Exe
+
+
\ No newline at end of file
diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
index 691b04388..47405fe76 100644
--- a/build/MSBuildExtensions.targets
+++ b/build/MSBuildExtensions.targets
@@ -113,6 +113,7 @@ Copyright (c) .NET Foundation. All rights reserved.
1.0.12
1.1.9
2.0.9
+ 2.1.2
]]>
diff --git a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
index a5d99468d..9e3850e74 100644
--- a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
+++ b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
@@ -48,6 +48,9 @@ namespace EndToEnd
var restoredVersion = GetAspNetCoreAppVersion(assetsFile, portable: true);
restoredVersion.Should().NotBeNull();
+ var bundledVersionPath = Path.Combine(projectDirectory, ".BundledAspNetCoreVersion");
+ var bundledVersion = File.ReadAllText(bundledVersionPath).Trim();
+
restoredVersion.ToNormalizedString().Should().BeEquivalentTo(bundledVersion,
"The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be idenitical to the versions set in DependencyVersions.props." +
"Please update MSBuildExtensions.targets in this repo so these versions match.");
diff --git a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
index 859aa4eb6..33c806128 100644
--- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
+++ b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
@@ -22,8 +23,9 @@ namespace EndToEnd
[ClassData(typeof(SupportedNetCoreAppVersions))]
public void ItRollsForwardToTheLatestVersion(string minorVersion)
{
- // https://github.com/dotnet/cli/issues/9661: remove this once the ASP.NET version bump
- // merges from 2.1.3xx -> 2.1.4xx -> 2.2.1xx
+ // https://github.com/dotnet/cli/issues/9661
+ // https://github.com/dotnet/sdk/issues/2446
+ // dotnet/sdk is missing handling for 2.1 when it isn't the latest runtime
if (minorVersion == "2.1")
{
return;
@@ -132,32 +134,5 @@ namespace EndToEnd
}
}
- public static IEnumerable