diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tools/Internal/PrecompileDispatchCommand.cs b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tools/Internal/PrecompileDispatchCommand.cs index 59ef9b9e05..8d73479987 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tools/Internal/PrecompileDispatchCommand.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tools/Internal/PrecompileDispatchCommand.cs @@ -190,7 +190,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Internal ProjectContext projectContext; if (TargetFramework != null) { - projectContext = projectContexts.FirstOrDefault(context => context.TargetFramework == TargetFramework); + projectContext = projectContexts.FirstOrDefault(context => context.TargetFramework.Equals(TargetFramework)); if (projectContext == null) { throw new InvalidOperationException($"Project '{ProjectPath}' does not support framework: {FrameworkOption.Value()}"); diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Test/project.json index 04baade058..d1209cc40a 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Test/project.json @@ -5,7 +5,7 @@ "xunit": "2.2.0-*" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "type": "platform", diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/ApplicationConsumingPrecompiledViews.cs b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/ApplicationConsumingPrecompiledViews.cs index 003e171bec..05eeb2506b 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/ApplicationConsumingPrecompiledViews.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/ApplicationConsumingPrecompiledViews.cs @@ -77,7 +77,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation ExecuteForClassLibrary(Command.CreateDotNet( "razor-precompile", - GetPrecompileArguments("netcoreapp1.0"))); + GetPrecompileArguments("netcoreapp1.1"))); var timestamp = "z" + DateTime.UtcNow.Ticks.ToString().PadLeft(18, '0'); var packCommand = Command diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/Infrastructure/ApplicationTestFixture.cs b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/Infrastructure/ApplicationTestFixture.cs index 820ce00a47..7bcbb53650 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/Infrastructure/ApplicationTestFixture.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/Infrastructure/ApplicationTestFixture.cs @@ -68,7 +68,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation RuntimeArchitecture.x64) { PublishApplicationBeforeDeployment = true, - TargetFramework = flavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.0", + TargetFramework = flavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.1", Configuration = "Release", EnvironmentVariables = { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/project.json index f2c685fab7..a655962ab9 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/project.json @@ -15,7 +15,7 @@ "xunit": "2.2.0-*" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "type": "platform", diff --git a/testapps/ApplicationUsingPrecompiledViewClassLibrary/project.json b/testapps/ApplicationUsingPrecompiledViewClassLibrary/project.json index 4585bd9e74..9a3adb72a6 100644 --- a/testapps/ApplicationUsingPrecompiledViewClassLibrary/project.json +++ b/testapps/ApplicationUsingPrecompiledViewClassLibrary/project.json @@ -14,7 +14,7 @@ "Microsoft.Extensions.Logging.Console": "1.1.0-*" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/testapps/ApplicationWithConfigureMvc/project.json b/testapps/ApplicationWithConfigureMvc/project.json index 0916482943..2913fe25f7 100644 --- a/testapps/ApplicationWithConfigureMvc/project.json +++ b/testapps/ApplicationWithConfigureMvc/project.json @@ -18,7 +18,7 @@ "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tools": "1.1.0-*" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/testapps/ApplicationWithTagHelpers/project.json b/testapps/ApplicationWithTagHelpers/project.json index b68a4c9706..776882f261 100644 --- a/testapps/ApplicationWithTagHelpers/project.json +++ b/testapps/ApplicationWithTagHelpers/project.json @@ -22,7 +22,7 @@ "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tools": "1.1.0-*" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/testapps/ClassLibraryWithPrecompiledViews/project.json b/testapps/ClassLibraryWithPrecompiledViews/project.json index 3a49d7cf3d..07bfb771c5 100644 --- a/testapps/ClassLibraryWithPrecompiledViews/project.json +++ b/testapps/ClassLibraryWithPrecompiledViews/project.json @@ -23,7 +23,7 @@ "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tools": "1.1.0-*" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/testapps/PublishWithEmbedViewSources/project.json b/testapps/PublishWithEmbedViewSources/project.json index d1b0245b5b..79fbf2fba6 100644 --- a/testapps/PublishWithEmbedViewSources/project.json +++ b/testapps/PublishWithEmbedViewSources/project.json @@ -18,7 +18,7 @@ "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tools": "1.1.0-*" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/testapps/SimpleApp/project.json b/testapps/SimpleApp/project.json index 0916482943..2913fe25f7 100644 --- a/testapps/SimpleApp/project.json +++ b/testapps/SimpleApp/project.json @@ -18,7 +18,7 @@ "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tools": "1.1.0-*" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/testapps/StrongNamedApp/project.json b/testapps/StrongNamedApp/project.json index d4f61b912e..727b9b6716 100644 --- a/testapps/StrongNamedApp/project.json +++ b/testapps/StrongNamedApp/project.json @@ -19,7 +19,7 @@ "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tools": "1.1.0-*" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*",