diff --git a/NuGet.config b/NuGet.config index 0fd623f..96b34db 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,5 +3,6 @@ + - + \ No newline at end of file diff --git a/RazorViewCompilation.sln b/RazorViewCompilation.sln index 65f7761..6b652d4 100644 --- a/RazorViewCompilation.sln +++ b/RazorViewCompilation.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26014.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design", "src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.csproj", "{4339FC9B-AEC6-442A-B413-A41555ED76C7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation", "src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj", "{4339FC9B-AEC6-442A-B413-A41555ED76C7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionFiles", "SolutionFiles", "{01707B64-7DC7-4B5A-B0BB-7CD2773AA297}" ProjectSection(SolutionItems) = preProject @@ -17,15 +17,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0398AFFF-5 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests", "test\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj", "{46C9A4B2-8B1C-451B-B670-C194901D66AC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Test", "test\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Test\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Test.csproj", "{E0D75B4E-839F-4F80-9B1F-B33F616BCC5F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EC60EE94-72A3-4CEC-ADF2-2A8AEDC094B2}" - ProjectSection(SolutionItems) = preProject - testapps\SimpleApp\SimpleApp.csproj = testapps\SimpleApp\SimpleApp.csproj - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleApp", "testapps\SimpleApp\SimpleApp.csproj", "{1140C5E1-1C9A-4895-BB7E-C2AB2C320472}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test", "test\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj", "{E0D75B4E-839F-4F80-9B1F-B33F616BCC5F}" EndProject + Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/makefile.shade b/makefile.shade index 159ae23..9f7652c 100644 --- a/makefile.shade +++ b/makefile.shade @@ -4,4 +4,4 @@ use-standard-lifecycle k-standard-goals #build-pack target='compile' - dotnet command='pack --output $PSScriptRoot/artifacts/build Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.csproj' dotnetDir='${Path.Combine(Directory.GetCurrentDirectory(), "src", "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design")}' \ No newline at end of file + dotnet command='pack --output ${Path.Combine(Directory.GetCurrentDirectory(), "artifacts", "build")}' dotnetDir='${Path.Combine(Directory.GetCurrentDirectory(), "src", "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation")}' \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.xproj b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.xproj deleted file mode 100644 index 253d749..0000000 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 4339fc9b-aec6-442a-b413-a41555ed76c7 - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Program.cs b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Program.cs deleted file mode 100644 index d0d272d..0000000 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Program.cs +++ /dev/null @@ -1,66 +0,0 @@ -// 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; -using Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Internal; - -namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design -{ - public class Program - { - private readonly static Type ProgramType = typeof(Program); - - public static int Main(string[] args) - { -#if DEBUG - DebugHelper.HandleDebugSwitch(ref args); -#endif - - EnsureValidDispatchRecipient(ref args); - - var app = new PrecompilationApplication(ProgramType); - new PrecompileRunCommand().Configure(app); - return app.Execute(args); - } - - private static void EnsureValidDispatchRecipient(ref string[] args) - { - const string DispatcherVersionArgumentName = "--dispatcher-version"; - - var dispatcherArgumentIndex = Array.FindIndex( - args, - (value) => string.Equals(value, DispatcherVersionArgumentName, StringComparison.OrdinalIgnoreCase)); - - if (dispatcherArgumentIndex < 0) - { - return; - } - - var dispatcherArgumentValueIndex = dispatcherArgumentIndex + 1; - if (dispatcherArgumentValueIndex < args.Length) - { - var dispatcherVersion = args[dispatcherArgumentValueIndex]; - - var thisAssembly = ProgramType.GetTypeInfo().Assembly; - var version = thisAssembly.GetCustomAttribute() - ?.InformationalVersion - ?? thisAssembly.GetName().Version.ToString(); - - if (string.Equals(dispatcherVersion, version, StringComparison.Ordinal)) - { - // Remove dispatcher arguments from - var preDispatcherArgument = args.Take(dispatcherArgumentIndex); - var postDispatcherArgument = args.Skip(dispatcherArgumentIndex + 2); - var newProgramArguments = preDispatcherArgument.Concat(postDispatcherArgument); - args = newProgramArguments.ToArray(); - return; - } - } - - // Could not validate the dispatcher version. - throw new InvalidOperationException("Could not invoke tool"); - } - } -} diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/build/net451/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.targets b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/build/net451/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.targets deleted file mode 100644 index 663777d..0000000 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/build/net451/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.targets +++ /dev/null @@ -1,33 +0,0 @@ - - - - $(MSBuildProjectDirectory) - $(OutputPath) - $(AssemblyName).PrecompiledViews.dll - $(OutputPath)$(MyGeneratedDll) - $(BuildDependsOn);MvcRazorPrecompile - - - - - $(MyGeneratedDll) - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/build/netcoreapp1.1/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.targets b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/build/netcoreapp1.1/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.targets deleted file mode 100644 index 13ff71d..0000000 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/build/netcoreapp1.1/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.targets +++ /dev/null @@ -1,34 +0,0 @@ - - - - $(MSBuildProjectDirectory) - $(OutputPath) - $(AssemblyName).PrecompiledViews.dll - $(OutputPath)$(MyGeneratedDll) - $(BuildDependsOn);MvcRazorPrecompile - - - - $(MyGeneratedDll) - - - - - - - - - - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/CommonOptions.cs b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/CommonOptions.cs similarity index 95% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/CommonOptions.cs rename to src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/CommonOptions.cs index 6a705c3..5f954cf 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/CommonOptions.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/CommonOptions.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.CommandLineUtils; -namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Internal +namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Internal { public class CommonOptions { diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/DebugHelper.cs b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/DebugHelper.cs similarity index 91% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/DebugHelper.cs rename to src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/DebugHelper.cs index fb4f36a..1999e85 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/DebugHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/DebugHelper.cs @@ -6,7 +6,7 @@ using System.Diagnostics; using System.Linq; -namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Internal +namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Internal { public static class DebugHelper { diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/MvcServiceProvider.cs b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/MvcServiceProvider.cs similarity index 98% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/MvcServiceProvider.cs rename to src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/MvcServiceProvider.cs index a4d33d3..1c91467 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/MvcServiceProvider.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/MvcServiceProvider.cs @@ -14,7 +14,7 @@ using Microsoft.Extensions.ObjectPool; using Microsoft.Extensions.Options; -namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Internal +namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Internal { public class MvcServiceProvider { diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/PrecompilationApplication.cs b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompilationApplication.cs similarity index 67% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/PrecompilationApplication.cs rename to src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompilationApplication.cs index fc62ff1..a8ff4ca 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/PrecompilationApplication.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompilationApplication.cs @@ -2,10 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Collections.Generic; +using System.IO; using System.Reflection; using Microsoft.Extensions.CommandLineUtils; -namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Internal +namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Internal { public class PrecompilationApplication : CommandLineApplication { @@ -33,7 +35,7 @@ public PrecompilationApplication(Type callingType) { try { - return base.Execute(args); + return base.Execute(ExpandResponseFiles(args)); } catch (Exception ex) { @@ -49,5 +51,22 @@ private string GetInformationalVersion() var attribute = assembly.GetCustomAttribute(); return attribute.InformationalVersion; } + + private static string[] ExpandResponseFiles(string[] args) + { + var expandedArgs = new List(); + foreach (var arg in args) + { + if (!arg.StartsWith("@", StringComparison.Ordinal)) + { + expandedArgs.Add(arg); + } + + var fileName = arg.Substring(1); + expandedArgs.AddRange(File.ReadLines(fileName)); + } + + return expandedArgs.ToArray(); + } } } diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/PrecompileRunCommand.cs b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompileRunCommand.cs similarity index 99% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/PrecompileRunCommand.cs rename to src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompileRunCommand.cs index b68ef54..897c2e5 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/PrecompileRunCommand.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompileRunCommand.cs @@ -19,7 +19,7 @@ using Microsoft.Extensions.CommandLineUtils; using Microsoft.Extensions.FileProviders; -namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Internal +namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Internal { public class PrecompileRunCommand { diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/SnkUtils.cs b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/SnkUtils.cs similarity index 97% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/SnkUtils.cs rename to src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/SnkUtils.cs index 7f5d052..dfe3edb 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/SnkUtils.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/SnkUtils.cs @@ -5,7 +5,7 @@ using System.Collections.Immutable; using System.IO; -namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Internal +namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Internal { // Copied from https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.DotNet.ProjectModel.Workspaces/SnkUtils.cs public static class SnkUtils diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/StrongNameOptions.cs b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/StrongNameOptions.cs similarity index 95% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/StrongNameOptions.cs rename to src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/StrongNameOptions.cs index 0fac0f1..d22580b 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/StrongNameOptions.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/StrongNameOptions.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.CommandLineUtils; -namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Internal +namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Internal { public class StrongNameOptions { diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/ViewCompilationInfo.cs b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewCompilationInfo.cs similarity index 90% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/ViewCompilationInfo.cs rename to src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewCompilationInfo.cs index 56e1412..8630b3f 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/ViewCompilationInfo.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewCompilationInfo.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc.Razor.Compilation; using Microsoft.AspNetCore.Razor.CodeGenerators; -namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Internal +namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Internal { public class ViewCompilationInfo { diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/ViewInfoContainerCodeGenerator.cs b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewInfoContainerCodeGenerator.cs similarity index 94% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/ViewInfoContainerCodeGenerator.cs rename to src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewInfoContainerCodeGenerator.cs index 0d79425..4c02f27 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Internal/ViewInfoContainerCodeGenerator.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewInfoContainerCodeGenerator.cs @@ -13,7 +13,7 @@ using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Text; -namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Internal +namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Internal { public class ViewInfoContainerCodeGenerator { @@ -63,15 +63,16 @@ public void AddAssemblyMetadata( if (!string.IsNullOrEmpty(strongNameOptions.KeyFile)) { var updatedOptions = Compilation.Options.WithStrongNameProvider(new DesktopStrongNameProvider()); + var keyFilePath = Path.GetFullPath(strongNameOptions.KeyFile); if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || strongNameOptions.PublicSign) { updatedOptions = updatedOptions.WithCryptoPublicKey( - SnkUtils.ExtractPublicKey(File.ReadAllBytes(strongNameOptions.KeyFile))); + SnkUtils.ExtractPublicKey(File.ReadAllBytes(keyFilePath))); } else { - updatedOptions = updatedOptions.WithCryptoKeyFile(strongNameOptions.KeyFile) + updatedOptions = updatedOptions.WithCryptoKeyFile(keyFilePath) .WithDelaySign(strongNameOptions.DelaySign); } diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.csproj b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj similarity index 74% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.csproj rename to src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj index 6877f8c..1832e1a 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj @@ -7,27 +7,25 @@ cshtml;razor;compilation;precompilation;aspnetcore true exe + + + build - - + - - - + + + - - - - - - + + \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Program.cs b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Program.cs new file mode 100644 index 0000000..5a22324 --- /dev/null +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Program.cs @@ -0,0 +1,26 @@ +// 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; +using Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Internal; + +namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation +{ + public class Program + { + private readonly static Type ProgramType = typeof(Program); + + public static int Main(string[] args) + { +#if DEBUG + DebugHelper.HandleDebugSwitch(ref args); +#endif + + var app = new PrecompilationApplication(ProgramType); + new PrecompileRunCommand().Configure(app); + return app.Execute(args); + } + } +} diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/Properties/AssemblyInfo.cs rename to src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/common.targets b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/common.targets new file mode 100644 index 0000000..17ad509 --- /dev/null +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/common.targets @@ -0,0 +1,54 @@ + + + $(MSBuildProjectDirectory) + $(OutputPath) + <_MvcRazorResponseFilePath>$(IntermediateOutputPath)/microsoft.aspnetcore.mvc.razor.viewcompilation.rsp + + + + + + + + + + + + + + + + + + + + + + $(AssemblyName).PrecompiledViews.dll + $(MvcRazorOutputPath)$(PrecompiledViewsGeneratedDll) + + + + + $(PrecompiledViewsGeneratedDll) + + + + + diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/net451/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/net451/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets new file mode 100644 index 0000000..3aae357 --- /dev/null +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/net451/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets @@ -0,0 +1,23 @@ + + + + + + $(OutputPath)$(MSBuildThisFileName).exe.config + + + $(OutputPath)$(MSBuildThisFileName).exe + + + + + + + + + + \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netcoreapp1.1/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netcoreapp1.1/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets new file mode 100644 index 0000000..0deaf01 --- /dev/null +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netcoreapp1.1/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets @@ -0,0 +1,14 @@ + + + + + --runtimeconfig "$(ProjectRuntimeConfigFilePath)" + $(ExecArgs) --depsfile "$(ProjectDepsFilePath)" + $(ExecArgs) "$(MSBuildThisFileDirectory)$(MSBuildThisFileName).dll" + $(ExecArgs) @"$(_MvcRazorResponseFilePath)" + + + + \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/buildCrossTargeting/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.targets b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/buildCrossTargeting/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design/buildCrossTargeting/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.targets rename to src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/buildCrossTargeting/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj index 072ba88..02428be 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj @@ -1,7 +1,7 @@  - netcoreapp1.2 + netcoreapp1.1 $(DefineConstants);__remove_this_to__GENERATE_BASELINES @@ -13,12 +13,11 @@ - + - - - + + - + diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Test.csproj b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj similarity index 70% rename from test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Test.csproj rename to test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj index 1d0f2ea..d03a549 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Test.csproj +++ b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp1.2 + netcoreapp1.1 @@ -9,13 +9,13 @@ - + - - + + diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Test/PrecompileRunCommandTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/PrecompileRunCommandTest.cs similarity index 97% rename from test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Test/PrecompileRunCommandTest.cs rename to test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/PrecompileRunCommandTest.cs index b81e566..feae75e 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Test/PrecompileRunCommandTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/PrecompileRunCommandTest.cs @@ -5,14 +5,13 @@ using System.IO; using System.Linq; using System.Reflection; -using Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design; -using Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design.Internal; +using Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Internal; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Emit; using Xunit; -namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tools +namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation { public class PrecompileRunCommandTest { diff --git a/testapps/ApplicationUsingPrecompiledViewClassLibrary/ApplicationUsingPrecompiledViewClassLibrary.csproj b/testapps/ApplicationUsingPrecompiledViewClassLibrary/ApplicationUsingPrecompiledViewClassLibrary.csproj new file mode 100644 index 0000000..1cb92e9 --- /dev/null +++ b/testapps/ApplicationUsingPrecompiledViewClassLibrary/ApplicationUsingPrecompiledViewClassLibrary.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.1;net451 + true + ApplicationUsingPrecompiledViewClassLibrary + Exe + win7-x64 + true + + + + + 1.0.0-* + + + 1.1.0 + + + 1.1.0 + + + 1.1.0 + + + 1.1.0 + + + + + + 1.1.0 + + + diff --git a/testapps/ApplicationUsingPrecompiledViewClassLibrary/ApplicationUsingPrecompiledViewClassLibrary.xproj b/testapps/ApplicationUsingPrecompiledViewClassLibrary/ApplicationUsingPrecompiledViewClassLibrary.xproj deleted file mode 100644 index 0559856..0000000 --- a/testapps/ApplicationUsingPrecompiledViewClassLibrary/ApplicationUsingPrecompiledViewClassLibrary.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - cef718e4-4556-422f-b64f-9d9671218e67 - ApplicationUsingPrecompiledViewClassLibrary - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/testapps/ApplicationUsingPrecompiledViewClassLibrary/project.json b/testapps/ApplicationUsingPrecompiledViewClassLibrary/project.json deleted file mode 100644 index 7eaf709..0000000 --- a/testapps/ApplicationUsingPrecompiledViewClassLibrary/project.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "ClassLibraryWithPrecompiledViews": { - "target": "package", - "version": "1.0.0-*" - }, - "Microsoft.AspNetCore.Mvc": "1.2.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*", - "Microsoft.Extensions.Configuration.CommandLine": "1.2.0-*", - "Microsoft.Extensions.Logging.Console": "1.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0-*", - "type": "platform" - } - } - }, - "net451": {} - }, - "publishOptions": { - "include": [ - "wwwroot", - "appsettings.json", - "web.config" - ] - } -} \ No newline at end of file diff --git a/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj b/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj index d70f11e..0fe2301 100644 --- a/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj +++ b/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj @@ -6,22 +6,21 @@ ApplicationWithConfigureMvc Exe win7-x64 + true - - - - - + + 1.1.0-* + All + + + + + - - - - - - + diff --git a/testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj b/testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj new file mode 100644 index 0000000..63acee5 --- /dev/null +++ b/testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj @@ -0,0 +1,50 @@ + + + + netcoreapp1.1;net451 + win7-x64 + true + ApplicationWithTagHelpers + Exe + win7-x64 + true + + + + + PreserveNewest + + + + + + + + + + 1.1.0 + + + 1.1.0-* + All + + + 1.1.0 + + + 1.1.0 + + + 1.1.0 + + + 1.1.1 + + + + + + 1.1.0 + + + diff --git a/testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.xproj b/testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.xproj deleted file mode 100644 index 5c14063..0000000 --- a/testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 2079872f-e8f9-4db1-a340-c0d897807b86 - ApplicationWithTagHelpers - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/testapps/ClassLibraryTagHelper/project.json b/testapps/ApplicationWithTagHelpers/ClassLibraryTagHelper/project.json similarity index 100% rename from testapps/ClassLibraryTagHelper/project.json rename to testapps/ApplicationWithTagHelpers/ClassLibraryTagHelper/project.json diff --git a/testapps/ApplicationWithTagHelpers/project.json b/testapps/ApplicationWithTagHelpers/project.json deleted file mode 100644 index 7ebf000..0000000 --- a/testapps/ApplicationWithTagHelpers/project.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "ClassLibraryTagHelper": { - "target": "project" - }, - "Microsoft.AspNetCore.Mvc": "1.2.0-*", - "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design": { - "version": "1.2.0-*", - "target": "package", - "type": "build" - }, - "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*", - "Microsoft.Extensions.Configuration.CommandLine": "1.2.0-*", - "Microsoft.Extensions.Logging.Console": "1.2.0-*", - "TagHelperSamples.Bootstrap": "1.1.1" - }, - "tools": { - "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tools": "1.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0-*", - "type": "platform" - } - } - }, - "net451": {} - }, - "publishOptions": { - "include": [ - "wwwroot", - "appsettings.json", - "web.config" - ] - }, - "scripts": { - "postpublish": "dotnet razor-precompile --configuration %publish:Configuration% --framework %publish:TargetFramework% --output-path %publish:OutputPath% %publish:ProjectPath%" - } -} \ No newline at end of file diff --git a/testapps/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj b/testapps/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj new file mode 100644 index 0000000..ad3180a --- /dev/null +++ b/testapps/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj @@ -0,0 +1,18 @@ + + + + netstandard1.6;net451 + ClassLibraryTagHelper + + + + + + + 1.1.0 + + + 1.6.1 + + + \ No newline at end of file diff --git a/testapps/ClassLibraryTagHelper/ClassLibraryTagHelper.xproj b/testapps/ClassLibraryTagHelper/ClassLibraryTagHelper.xproj deleted file mode 100644 index 80d4283..0000000 --- a/testapps/ClassLibraryTagHelper/ClassLibraryTagHelper.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 39efa075-3673-49ab-95f3-aa5e88df6c30 - ClassLibraryTagHelpers - .\obj - .\bin\ - v4.6.1 - - - - 2.0 - - - diff --git a/testapps/ClassLibraryWithPrecompiledViews/ClassLibraryWithPrecompiledViews.csproj b/testapps/ClassLibraryWithPrecompiledViews/ClassLibraryWithPrecompiledViews.csproj new file mode 100644 index 0000000..c0ed478 --- /dev/null +++ b/testapps/ClassLibraryWithPrecompiledViews/ClassLibraryWithPrecompiledViews.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.1;net451 + true + ClassLibraryWithPrecompiledViews + Exe + win7-x64 + true + + + + + lib/ + true + + + + + + 1.1.0 + + + 1.1.0-* + All + + + + + + 1.1.0 + + + + diff --git a/testapps/ClassLibraryWithPrecompiledViews/ClassLibraryWithPrecompiledViews.xproj b/testapps/ClassLibraryWithPrecompiledViews/ClassLibraryWithPrecompiledViews.xproj deleted file mode 100644 index 217dde2..0000000 --- a/testapps/ClassLibraryWithPrecompiledViews/ClassLibraryWithPrecompiledViews.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 4684de8b-3fbe-421b-8798-56c3d6698b76 - ClassLibraryWithPrecompiledViews - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/testapps/ClassLibraryWithPrecompiledViews/project.json b/testapps/ClassLibraryWithPrecompiledViews/project.json deleted file mode 100644 index de23995..0000000 --- a/testapps/ClassLibraryWithPrecompiledViews/project.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "preserveCompilationContext": true, - "emitEntryPoint": true - }, - "packOptions": { - "files": { - "mappings": { - "lib/": "obj/precompiled/" - } - } - }, - "dependencies": { - "Microsoft.AspNetCore.Mvc": "1.2.0-*", - "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design": { - "version": "1.2.0-*", - "target": "package", - "type": "build" - } - }, - "tools": { - "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tools": "1.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0-*", - "type": "platform" - } - } - }, - "net451": {} - } -} \ No newline at end of file diff --git a/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj b/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj new file mode 100644 index 0000000..17d045c --- /dev/null +++ b/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj @@ -0,0 +1,43 @@ + + + + netcoreapp1.1;net451 + true + PublishWithEmbedViewSources + Exe + win7-x64 + true + true + + + + + PreserveNewest + + + + + + 1.1.0 + + + 1.1.0-* + All + + + 1.1.0 + + + 1.1.0 + + + 1.1.0 + + + + + + 1.1.0 + + + diff --git a/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.xproj b/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.xproj deleted file mode 100644 index 25dace6..0000000 --- a/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - e3462190-3068-40f0-9aa5-34779fe252ac - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/testapps/PublishWithEmbedViewSources/project.json b/testapps/PublishWithEmbedViewSources/project.json deleted file mode 100644 index 685da88..0000000 --- a/testapps/PublishWithEmbedViewSources/project.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "Microsoft.AspNetCore.Mvc": "1.2.0-*", - "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design": { - "version": "1.2.0-*", - "target": "package", - "type": "build" - }, - "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*", - "Microsoft.Extensions.Configuration.CommandLine": "1.2.0-*", - "Microsoft.Extensions.Logging.Console": "1.2.0-*" - }, - "tools": { - "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tools": "1.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0-*", - "type": "platform" - } - } - }, - "net451": {} - }, - "publishOptions": { - "include": [ - "wwwroot", - "appsettings.json", - "web.config" - ] - }, - "scripts": { - "postpublish": "dotnet razor-precompile --embed-view-sources --configuration %publish:Configuration% --framework %publish:TargetFramework% --output-path %publish:OutputPath% %publish:ProjectPath%" - } -} \ No newline at end of file diff --git a/testapps/SimpleApp/1.txt b/testapps/SimpleApp/1.txt new file mode 100644 index 0000000..90b9651 --- /dev/null +++ b/testapps/SimpleApp/1.txt @@ -0,0 +1,2598 @@ + + + + + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + Debug + AnyCPU + + + + + + + Library + 512 + prompt + $(MSBuildProjectName) + $(MSBuildProjectName) + true + + + + true + false + + + true + + + x64 + + + x86 + + + + portable + + false + + {CandidateAssemblyFiles};{HintPathFromItem};{TargetFrameworkDirectory};{RawFileName} + $(AssemblySearchPaths) + + + + + true + + $(DotnetHostPath) + + + + CurrentArchitecture + CurrentRuntime + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + 4 + 1701;1702;1705 + + + DEBUG;TRACE + + + TRACE + + + + + + + + true + true + true + true + true + + + + <_DirectoryBuildPropsFile Condition="'$(_DirectoryBuildPropsFile)' == ''">Directory.Build.props + <_DirectoryBuildPropsBasePath Condition="'$(_DirectoryBuildPropsBasePath)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), '$(_DirectoryBuildPropsFile)')) + $([System.IO.Path]::Combine('$(_DirectoryBuildPropsBasePath)', '$(_DirectoryBuildPropsFile)')) + + + + + + obj\ + $(BaseIntermediateOutputPath)\ + $(BaseIntermediateOutputPath) + + $([System.IO.Path]::Combine('$(MSBuildProjectDirectory)', '$(MSBuildProjectExtensionsPath)')) + $(MSBuildProjectExtensionsPath)\ + true + + + + $(UserProfile)\.nuget\packages\ + + + + + + + + + + + + + + + 11.0 + 10.0 + + + + $(MSBuildExtensionsPath)\v4.0\Custom.Before.$(MSBuildThisFile) + $(MSBuildExtensionsPath)\v4.0\Custom.After.$(MSBuildThisFile) + + + + + $(MSBuildExtensionsPath)\v$(MSBuildToolsVersion)\Custom.Before.$(MSBuildThisFile) + $(MSBuildExtensionsPath)\v$(MSBuildToolsVersion)\Custom.After.$(MSBuildThisFile) + + + + + + true + + + $(DefaultProjectConfiguration) + $(DefaultProjectPlatform) + + + WJProject + JavaScript + + + + + + + + + + + + + + + + + $(GlobalExclude);bin\**;obj\**;node_modules\**;jspm_packages\**;bower_components\**;**\*.user;**\*.*proj;**\*.sln;**\*.vssscc;**\.*\** + + + + + + + + + + + + + + + + + + + netcoreapp1.1;net451 + true + SimpleApp + Exe + win7-x64 + true + + + + 1.1.0-* + All + + + + + + + + + 1.1.0 + + + + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + true + + + + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + Debug + AnyCPU + $(Platform) + bin\ + $(BaseOutputPath)\ + $(BaseOutputPath)$(Configuration)\ + $(BaseOutputPath)$(PlatformName)\$(Configuration)\ + $(OutputPath)\ + obj\ + $(BaseIntermediateOutputPath)\ + $(BaseIntermediateOutputPath)$(Configuration)\ + $(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\ + $(IntermediateOutputPath)\ + + + + $(OutputPath) + + + + + + $(MSBuildToolsPath)\Microsoft.CSharp.targets + $(MSBuildToolsPath)\Microsoft.VisualBasic.targets + + + + + + + true + + + + + + $(MSBuildFrameworkToolsPath)\Microsoft.CSharp.targets + + $(MsBuildFrameworkToolsPath) + + + + + $(MSBuildToolsPath)\Microsoft.CSharp.CrossTargeting.targets + + + + + $(MSBuildToolsPath)\Microsoft.CSharp.CurrentVersion.targets + + + + + + $(ImportByWildcardBeforeMicrosoftCommonTargets) + true + $(ImportByWildcardAfterMicrosoftCommonTargets) + true + $(ImportUserLocationsByWildcardBeforeMicrosoftCommonTargets) + true + $(ImportUserLocationsByWildcardAfterMicrosoftCommonTargets) + true + false + false + false + false + $(MSBuildExtensionsPath)\v4.0\Custom.Before.Microsoft.Common.targets + $(MSBuildExtensionsPath)\v4.0\Custom.After.Microsoft.Common.targets + + $(ImportByWildcardBeforeMicrosoftCSharpTargets) + true + $(ImportByWildcardAfterMicrosoftCSharpTargets) + true + $(ImportUserLocationsByWildcardBeforeMicrosoftCSharpTargets) + true + $(ImportUserLocationsByWildcardAfterMicrosoftCSharpTargets) + true + false + false + false + false + $(MSBuildExtensionsPath)\v4.0\Custom.Before.Microsoft.CSharp.targets + $(MSBuildExtensionsPath)\v4.0\Custom.After.Microsoft.CSharp.targets + + + + $(ImportByWildcardBeforeMicrosoftNetFrameworkProps) + true + $(ImportByWildcardAfterMicrosoftNetFrameworkProps) + true + $(ImportUserLocationsByWildcardBeforeMicrosoftNetFrameworkProps) + true + $(ImportUserLocationsByWildcardAfterMicrosoftNetFrameworkProps) + true + false + false + false + false + + + + + + + + + + + + + + + + + + + + + $(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed\Microsoft.CSharp.DesignTime.targets + + + + + + true + + + + + + + <_TargetFramework Include="$(TargetFrameworks)" /> + + + + + + + + + + Build + + + + + + + Clean + + + + + + + Rebuild + + + + + true + + + + + + $(MSBuildExtensionsPath)\NuGet.targets + + + + + + true + + NuGet.Build.Tasks.dll + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_GenerateRestoreGraphProjectEntryInputProperties> + %(_MSBuildProjectReferenceExistent.SetConfiguration); + %(_MSBuildProjectReferenceExistent.SetPlatform); + RestoreUseCustomAfterTargets=$(RestoreUseCustomAfterTargets); + NuGetRestoreTargets=$(MSBuildThisFileFullPath); + BuildProjectReferences=false; + ExcludeRestorePackageImports=true; + + + <_GenerateRestoreGraphProjectEntryInputProperties Condition=" '$(RestoreUseCustomAfterTargets)' == 'true' "> + $(_GenerateRestoreGraphProjectEntryInputProperties); + CustomAfterMicrosoftCommonCrossTargetingTargets=$(MSBuildThisFileFullPath); + CustomAfterMicrosoftCommonTargets=$(MSBuildThisFileFullPath); + + + + + + + + + + + + + + + + + <_RestoreGraphEntry Include="$([System.Guid]::NewGuid())" Condition=" '$(_ProjectRestoreType)' != 'Unknown' "> + RestoreSpec + $(MSBuildProjectFullPath) + + + + + + + netcoreapp1.0 + + + + + + + + + + + + + + + + + + <_ProjectRestoreType>Unknown + <_ProjectRestoreType Condition=" '$(_CurrentProjectJsonPath)' != '' ">UAP + <_ProjectRestoreType Condition=" '$(TargetFrameworks)' != '' ">NETCore + <_ProjectRestoreType Condition=" '$(TargetFramework)' != '' AND @(PackageReference) != '' ">NETCore + + + + + + + <_RestoreTargetFrameworksOutput Include="$(TargetFrameworks.Split(';'))" /> + + + + <_RestoreTargetFrameworksOutput Include="$(TargetFramework)" /> + + + + + + + + + + + $(BaseIntermediateOutputPath) + + + + + + + <_RestoreProjectName>$(MSBuildProjectName) + <_RestoreProjectName Condition=" '$(_ProjectRestoreType)' == 'NETCore' AND '$(AssemblyName)' != '' ">$(AssemblyName) + <_RestoreProjectName Condition=" '$(_ProjectRestoreType)' == 'NETCore' AND '$(PackageId)' != '' ">$(PackageId) + + + + <_RestoreProjectVersion>1.0.0 + <_RestoreProjectVersion Condition=" '$(Version)' != '' ">$(Version) + <_RestoreProjectVersion Condition=" '$(PackageVersion)' != '' ">$(PackageVersion) + + + + <_RestoreCrossTargeting>true + + + + <_RestoreGraphEntry Include="$([System.Guid]::NewGuid())"> + ProjectSpec + $(_RestoreProjectVersion) + $(MSBuildProjectFullPath) + $(MSBuildProjectFullPath) + $(_RestoreProjectName) + $(RestoreSources) + $(RestoreFallbackFolders) + $(RestorePackagesPath) + $(RestoreFallbackFolders) + $(_ProjectRestoreType) + $(RestoreOutputAbsolutePath) + @(_RestoreTargetFrameworksOutputFiltered) + $(RuntimeIdentifiers);$(RuntimeIdentifier) + $(RuntimeSupports) + $(_RestoreCrossTargeting) + $(RestoreLegacyPackagesDirectory) + + + + + <_RestoreGraphEntry Include="$([System.Guid]::NewGuid())"> + ProjectSpec + $(MSBuildProjectFullPath) + $(MSBuildProjectFullPath) + $(_RestoreProjectName) + $(RestoreSources) + $(RestoreFallbackFolders) + $(RestorePackagesPath) + $(RestoreFallbackFolders) + $(_CurrentProjectJsonPath) + $(_ProjectRestoreType) + + + + + <_RestoreGraphEntry Include="$([System.Guid]::NewGuid())"> + ProjectSpec + $(MSBuildProjectFullPath) + $(MSBuildProjectFullPath) + $(_RestoreProjectName) + $(_ProjectRestoreType) + $(TargetFrameworkMoniker) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_RestoreGraphEntry Include="$([System.Guid]::NewGuid())"> + TargetFrameworkInformation + $(MSBuildProjectFullPath) + $(PackageTargetFallback) + $(TargetFramework) + + + + + + + + + + + + + + + + + + + + + + + true + + + + + $(MSBuildExtensionsPath)\Microsoft.TestPlatform.Build.dll + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + + + <_TargetFramework Include="$(TargetFrameworks)" /> + + + + + + + + + + + + + + + + + + + VSTest + + + + + + true + + + + $(UserProfile)\.nuget\packages\ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(MSBuildFrameworkToolsPath) + + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + $(MSBuildThisFileDirectory)..\tools\ + netcoreapp1.0 + net46 + $(MicrosoftNETBuildTasksDirectoryRoot)$(MicrosoftNETBuildTasksTFM)/ + $(MicrosoftNETBuildTasksDirectory)Microsoft.NET.Build.Tasks.dll + + + 1.0.0 + + $(VersionPrefix)-$(VersionSuffix) + $(VersionPrefix) + $(AssemblyName) + $(Authors) + $(AssemblyName) + $(AssemblyName) + en + + + + + + + + <_SkipNearestTargetFrameworkResolution Condition="'$(TargetFramework)' != '' and '$(ReferringTargetFramework)' == ''">true + $(TargetFramework) + <_PossibleTargetFrameworks Condition="'$(TargetFramework)' != ''">$(TargetFramework) + <_PossibleTargetFrameworks Condition="'$(TargetFramework)' == ''">$(TargetFrameworks) + + + + + + + + + + + + + + + $(MSBuildSDKsPath)\NuGet.Build.Tasks.Pack\buildCrossTargeting\NuGet.Build.Tasks.Pack.targets + $(MSBuildSDKsPath)\NuGet.Build.Tasks.Pack\build\NuGet.Build.Tasks.Pack.targets + + + + + + ..\CoreCLR\NuGet.Build.Tasks.Pack.dll + ..\Desktop\NuGet.Build.Tasks.Pack.dll + + + + + $(AssemblyName) + $(Version) + true + _LoadPackInputItems; _WalkEachTargetPerFramework; _GetPackageFiles + Package Description + true + true + tools + lib + + + $(GenerateNuspecDependsOn) + + + Build;$(GenerateNuspecDependsOn) + + + GenerateNuspec + + + PackUsingNuspec + + + <_TargetFrameworks Condition="'$(TargetFramework)' == ''" Include="$(TargetFrameworks.Split(';'))" /> + <_TargetFrameworks Condition="'$(TargetFramework)' != ''" Include="$(TargetFramework)" /> + + + + + + true + + + + + + + + false + + + $(OutputPath) + + + + + + + + + $(ProjectFileToPack) + + + + $(MSBuildProjectFullPath) + + + + + + + + + + + + + + + + + + + + + + + <_ProjectReferences Include="$(MSBuildProjectFullPath)"> + $(PackageId) + $(PackageVersion) + + + + + + + + + + + + + + <_ProjectReferences Include="@(_ProjectReferencesWithoutParentData)"> + $(TargetFramework) + Package + + <_ProjectReferences Condition="'%(_ProjectReferences.IncludeAssets)' == ''"> + all + + <_ProjectReferences Condition="'%(_ProjectReferences.ExcludeAssets)' == ''"> + none + + <_ProjectReferences Condition="'%(_ProjectReferences.PrivateAssets)' == ''"> + build;contentFiles;analyzers + + + + + + + <_PackageFilesToExclude Include="@(Content)" Condition="'%(Content.Pack)' == 'false'" /> + + + + <_PackageFiles Include="@(Content)" Condition=" %(Content.Pack) != 'false' " /> + <_PackageFiles Include="@(Compile)" Condition=" %(Compile.Pack) == 'true' " /> + <_PackageFiles Include="@(None)" Condition=" %(None.Pack) == 'true' " /> + + + + + + + <_PackageReferences Include="%(PackageReference.Identity)"> + $(TargetFramework) + %(PackageReference.IncludeAssets) + %(PackageReference.ExcludeAssets) + %(PackageReference.PrivateAssets) + %(PackageReference.Version) + + + + + + + + + + + + $(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed.Web\ + $(LangName) + en-us + + + + + + + + + + + + BrowseObject + + + + + + + + + + + + true + <_PublishTaskFramework Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp1.0 + <_PublishTaskNameSuffix Condition=" '$(MSBuildRuntimeType)' == 'Core'">Core + <_PublishTaskFramework Condition=" '$(_PublishTaskFramework)' == ''">net46 + <_PublishTasksDir Condition=" '$(_PublishTasksDir)'=='' ">$(MSBuildThisFileDirectory)..\..\tools\$(_PublishTaskFramework)\ + <_PublishTaskAssemblyFullPath Condition=" '$(_PublishTaskAssemblyFullPath)'=='' ">$(_PublishTasksDir)\Microsoft.NET$(_PublishTaskNameSuffix).Sdk.Publish.Tasks.dll + <_BeforePublishTargetsDir Condition=" '$(_BeforePublishTargetsDir)' == ''">$(MSBuildThisFileDirectory)BeforePublishTargets\ + <_CopyTargetsDir Condition=" '$(_CopyTargetsDir)' == ''">$(MSBuildThisFileDirectory)CopyTargets\ + <_TransformTargetsDir Condition=" '$(_TransformTargetsDir)' == ''">$(MSBuildThisFileDirectory)TransformTargets\ + <_ComputeTargetsDir Condition=" '$(_ComputeTargetsDir)'=='' ">$(MSBuildThisFileDirectory)ComputeTargets\ + <_PublishTargetsDir Condition=" '$(_PublishTargetsDir)'=='' ">$(MSBuildThisFileDirectory)PublishTargets\ + <_PublishProfilesDir Condition=" '$(_PublishProfilesDir)'=='' ">$(MSBuildThisFileDirectory)PublishProfiles\ + <_DotNetCLIToolTargetsDir Condition=" '$(_DotNetCLIToolTargetsDir)'=='' ">$(MSBuildThisFileDirectory)DotNetCLIToolTargets\ + + + + + + + <_PublishProfileRootFolder Condition="'$(_PublishProfileRootFolder)' == '' and '$(MSBuildProjectExtension)' =='.vbproj' ">$(MSBuildProjectDirectory)\My Project\PublishProfiles\ + <_PublishProfileRootFolder Condition="'$(_PublishProfileRootFolder)' == '' and '$(MSBuildProjectExtension)' =='.csproj' ">$(MSBuildProjectDirectory)\Properties\PublishProfiles\ + DefaultProfile + $([System.IO.Path]::GetFileNameWithoutExtension($(PublishProfile))) + $(_PublishProfileRootFolder)$(PublishProfileName).pubxml + $(_PublishProfilesDir)$(PublishProfileName).pubxml + + $(PublishProfileFullPath) + + + + + FileSystem + $(OutputPath)Publish\ + False + false + + + + + + $(WebPublishMethod) + + MSDeployPackage + + Docker + + $(LastUsedBuildConfiguration) + $(Configuration) + <_PublishConfigurationPath Condition="'$(_PublishConfigurationPath)' == '' And '$(PublishConfiguration)' != ''">$(PublishConfiguration)\ + $(TargetFramework) + $(TargetFrameworks) + <_PublishFrameworkPath Condition="'$(_PublishFrameworkPath)' == '' And '$(PublishFramework)' != ''">$(PublishFramework)\ + <_RuntimeIdentifierPath Condition="'$(_RuntimeIdentifierPath)' == '' And '$(RuntimeIdentifier)' != '' ">$(RuntimeIdentifier)\ + $(MSBuildProjectDirectory)\$(BaseIntermediateOutputPath) + $(BaseIntermediateOutputPath)\ + $([System.IO.Path]::GetFullPath($(BaseIntermediateOutputPath)$(_PublishConfigurationPath)$(_PublishFrameworkPath)$(_RuntimeIdentifierPath)PublishTemp\)) + $(PublishIntermediateTempPath)PublishOutput\ + + obj/Docker/publish/ + + + + + + + + + + + <_DotNetPublishComputeFiles> + _DetermineProjectType; + _WebAppComputeFiles; + _ConsoleAppComputeFiles; + + + + + + + + <_IsManagedProject Condition="%(ProjectCapability.Identity) == 'Managed'">true + <_PublishProjectType Condition="'$(_PublishProjectType)' == '' and '$(_IsManagedProject)' == 'true' ">Managed + <_PublishProjectType Condition="'$(_PublishProjectType)' == '' and '$(OutputType)' =='Exe' ">Console + <_PublishProjectType Condition="'$(_PublishProjectType)' == '' and '$(OutputType)' == 'Library'">WebApp + <_PublishProjectType Condition="'$(_PublishProjectType)' == '' ">WebSite + + + + + + + <_WebAppComputeFilesDependsOn> + $(_WebAppComputeFilesDependsOn); + _PrepareForWebAppPublish + _ComputeFilesFromOutDir; + _ComputeFilesFromContent; + + + + + + + + + <_ComputeFilesFromOutDirPrefix Condition="'$(_ComputeFilesFromOutDirPrefix)' == ''">bin\ + <_ComputeFilesFromContentPrefix Condition="'$(_ComputeFilesFromContentPrefix)' == ''" /> + + + + + + + <_ConsoleAppComputeFilesDependsOn> + $(_ConsoleAppComputeFilesDependsOn); + _PrepareForConsoleAppPublish + _ComputeFilesFromOutDir; + _ComputeFilesFromContent; + + + + + + + + + Continuous + $(AssemblyName) + <_WebJobAppDataPath Condition="'$(_WebJobAppDataPath)' == ''">app_data\Jobs\$(WebJobType)\$(WebJobName)\ + <_ComputeFilesFromOutDirPrefix Condition="'$(_ComputeFilesFromOutDirPrefix)' == ''">$(_WebJobAppDataPath) + <_ComputeFilesFromContentPrefix Condition="'$(_ComputeFilesFromContentPrefix)' == ''" /> + + + + + + + + <_OutDirFiles Include="$(OutDir)**\*.*" Exclude="$(OutDir)Publish\**\*.*" /> + + + + + + + + + + + + + + + + + + + + + + + + + + False + + + + + + + + <_DotNetPublishCopyFiles> + _RemoveExcludeFiles; + _DeletePublishIntermediateOutputPath; + _CopyFilesToPublishIntermediateOutputPath; + _CopyManagedProjectFilesToPublishIntermediateOutputPath; + + + + + + + + + + + + + + + + + <_PublishTempFiles Include="$(PublishIntermediateOutputPath)**\*.*" /> + + + + + + + + + + + + + + + <_CopyManagedProjectFilesToPublishIntermediateOutputPathDependsOn> + $(_CopyManagedProjectFilesToPublishIntermediateOutputPathDependsOn); + _PrepareForManagedProjectSystemPublish; + Publish; + + + + + + + + + $(PublishIntermediateOutputPath) + $(PublishFramework) + $(PublishConfiguration) + + + + + + + + + False + + + + + + + + + <_DotNetPublishTransformFiles> + _WebConfigTransform; + + + + + <_IsManagedProject Condition="%(ProjectCapability.Identity) == 'Managed'">true + <_IsAspNetCoreProject Condition="%(ProjectCapability.Identity) == 'AspNetCore'">true + <_IsPortable Condition=" '$(_IsPortable)' == '' And '$(_IsManagedProject)' == 'true' And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(RuntimeIdentifier)' != '' ">false + <_IsPortable Condition=" '$(_IsPortable)' == '' And '$(_IsManagedProject)' == 'true' And '$(TargetFrameworkIdentifier)' == '.NETFramework' ">false + <_IsPortable Condition=" '$(_IsPortable)' == ''">true + <_TransformWebConfigForAzure Condition=" '$(WEBSITE_SITE_NAME)' != '' Or '$(DOTNET_CONFIGURE_AZURE)' == 'true' Or '$(DOTNET_CONFIGURE_AZURE)' == '1'">true + + + + + + + + + <_DotNetPublishFiles> + FileSystemPublish; + + + + + + $(FileSystemPublishDependsOn); + _DeleteDestinationFilesIfSpecified; + _GatherFilesFromPublishIntermediateOutputPath; + + + + + + + + + $(PublishUrl)\ + + + <_DestinationFiles Include="$(PublishUrl)**\*" /> + + + + + + + <_PublishIntermediateOutputPathFiles Include="$(PublishIntermediateOutputPath)**\*.*" /> + + + + + + + + + <_IsManagedProject Condition="%(ProjectCapability.Identity) == 'Managed'">true + <_IsAspNetCoreProject Condition="%(ProjectCapability.Identity) == 'AspNetCore'">true + + + + + <_DotNetCLIPrePublishDependsOn> + _InitProjectCapabilityProperties; + _ManagedProjectSystemPrePublish; + + + + + <_ManagedProjectSystemPrePublishDependsOn> + BeforePublish; + + + + + + <_DotNetCLIPostPublishDependsOn> + _InitProjectCapabilityProperties; + _ManagedProjectSystemPostPublish; + AfterPublish; + + + + + <_ManagedProjectSystemPostPublishDependsOn> + _InitPublishIntermediateOutputPath; + $(_DotNetPublishTransformFiles); + + + + + + $(PublishDir) + + + + + + + BeforePublish; + CorePublish; + AfterPublish; + + + + + + $(_DotNetPublishComputeFiles); + $(_DotNetPublishCopyFiles); + $(_DotNetPublishTransformFiles); + $(_DotNetPublishFiles); + + + + + + + true + + + + + + \ No newline at end of file diff --git a/testapps/SimpleApp/SimpleApp.csproj b/testapps/SimpleApp/SimpleApp.csproj index 3a9ff63..9025087 100644 --- a/testapps/SimpleApp/SimpleApp.csproj +++ b/testapps/SimpleApp/SimpleApp.csproj @@ -1,21 +1,25 @@  - netcoreapp1.2 + netcoreapp1.1;net451 true SimpleApp Exe + win7-x64 + true - - + + 1.1.0-* + All + + + + + - - - - - - - - + + + 1.1.0 + diff --git a/testapps/SimpleAppDesktopOnly/SimpleAppDesktopOnly.csproj b/testapps/SimpleAppDesktopOnly/SimpleAppDesktopOnly.csproj new file mode 100644 index 0000000..6af44ee --- /dev/null +++ b/testapps/SimpleAppDesktopOnly/SimpleAppDesktopOnly.csproj @@ -0,0 +1,30 @@ + + + + net451 + win7-x64 + true + SimpleAppDesktopOnly + Exe + true + + + + + 1.1.0 + + + 1.1.0-* + All + + + 1.1.0 + + + 1.1.0 + + + 1.1.0 + + + diff --git a/testapps/SimpleAppDesktopOnly/SimpleAppDesktopOnly.xproj b/testapps/SimpleAppDesktopOnly/SimpleAppDesktopOnly.xproj deleted file mode 100644 index c57afbe..0000000 --- a/testapps/SimpleAppDesktopOnly/SimpleAppDesktopOnly.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - a0b0a141-a32b-4f33-b85f-5ca8c107105f - SimpleAppDesktopOnly - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/testapps/SimpleAppDesktopOnly/project.json b/testapps/SimpleAppDesktopOnly/project.json deleted file mode 100644 index 721d2fd..0000000 --- a/testapps/SimpleAppDesktopOnly/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "Microsoft.AspNetCore.Mvc": "1.2.0-*", - "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design": { - "version": "1.2.0-*", - "target": "package", - "type": "build" - }, - "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*", - "Microsoft.Extensions.Configuration.CommandLine": "1.2.0-*", - "Microsoft.Extensions.Logging.Console": "1.2.0-*" - }, - "tools": { - "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tools": "1.2.0-*" - }, - "frameworks": { - "net451": {} - }, - "publishOptions": { - "include": [ - "wwwroot", - "appsettings.json", - "web.config" - ] - }, - "scripts": { - "postpublish": "dotnet razor-precompile --configuration %publish:Configuration% --framework %publish:TargetFramework% --output-path %publish:OutputPath% %publish:ProjectPath%" - } -} \ No newline at end of file diff --git a/testapps/StrongNamedApp/StrongNamedApp.csproj b/testapps/StrongNamedApp/StrongNamedApp.csproj new file mode 100644 index 0000000..010c8a7 --- /dev/null +++ b/testapps/StrongNamedApp/StrongNamedApp.csproj @@ -0,0 +1,42 @@ + + + + netcoreapp1.1;net451 + true + StrongNamedApp + Exe + ../../build/Key.snk + true + true + win7-x64 + true + + + + + 1.1.0 + + + 1.1.0-* + + + 1.1.0 + + + 1.1.0 + + + 1.1.0 + + + + + + 1.1.0 + + + + + $(DefineConstants);RELEASE + + diff --git a/testapps/StrongNamedApp/StrongNamedApp.xproj b/testapps/StrongNamedApp/StrongNamedApp.xproj deleted file mode 100644 index 3cc9e35..0000000 --- a/testapps/StrongNamedApp/StrongNamedApp.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 88903be5-0676-4667-8160-b24646e0b76e - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/testapps/StrongNamedApp/project.json b/testapps/StrongNamedApp/project.json deleted file mode 100644 index 9a58603..0000000 --- a/testapps/StrongNamedApp/project.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "keyFile": "../../build/Key.snk" - }, - "dependencies": { - "Microsoft.AspNetCore.Mvc": "1.2.0-*", - "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design": { - "version": "1.2.0-*", - "target": "package", - "type": "build" - }, - "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*", - "Microsoft.Extensions.Configuration.CommandLine": "1.2.0-*", - "Microsoft.Extensions.Logging.Console": "1.2.0-*" - }, - "tools": { - "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tools": "1.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0-*", - "type": "platform" - } - } - }, - "net451": {} - }, - "publishOptions": { - "include": [ - "wwwroot", - "appsettings.json", - "web.config" - ] - }, - "scripts": { - "postpublish": "dotnet razor-precompile --configuration %publish:Configuration% --framework %publish:TargetFramework% --output-path %publish:OutputPath% %publish:ProjectPath%" - } -} \ No newline at end of file diff --git a/testapps/TestApps.sln b/testapps/TestApps.sln index 446c1ad..c5bd860 100644 --- a/testapps/TestApps.sln +++ b/testapps/TestApps.sln @@ -5,23 +5,23 @@ VisualStudioVersion = 15.0.26014.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{43488AEE-CCF2-4A90-B890-05320282BE29}" ProjectSection(SolutionItems) = preProject - testapps\global.json = testapps\global.json - testapps\NuGet.config = testapps\NuGet.config + global.json = global.json + NuGet.config = NuGet.config EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithTagHelpers", "testapps\ApplicationWithTagHelpers\ApplicationWithTagHelpers.xproj", "{2079872F-E8F9-4DB1-A340-C0D897807B86}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithTagHelpers", "ApplicationWithTagHelpers\ApplicationWithTagHelpers.csproj", "{2079872F-E8F9-4DB1-A340-C0D897807B86}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibraryTagHelper", "testapps\ClassLibraryTagHelper\ClassLibraryTagHelper.xproj", "{39EFA075-3673-49AB-95F3-AA5E88DF6C30}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibraryTagHelper", "ClassLibraryTagHelper\ClassLibraryTagHelper.csproj", "{39EFA075-3673-49AB-95F3-AA5E88DF6C30}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithConfigureMvc", "testapps\ApplicationWithConfigureMvc\ApplicationWithConfigureMvc.xproj", "{E2EAEB85-91D5-478E-9CE2-964F68DE20D0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithConfigureMvc", "ApplicationWithConfigureMvc\ApplicationWithConfigureMvc.csproj", "{E2EAEB85-91D5-478E-9CE2-964F68DE20D0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibraryWithPrecompiledViews", "testapps\ClassLibraryWithPrecompiledViews\ClassLibraryWithPrecompiledViews.xproj", "{4684DE8B-3FBE-421B-8798-56C3D6698B76}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibraryWithPrecompiledViews", "ClassLibraryWithPrecompiledViews\ClassLibraryWithPrecompiledViews.csproj", "{4684DE8B-3FBE-421B-8798-56C3D6698B76}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PublishWIthEmbedViewSources", "testapps\PublishWIthEmbedViewSources\PublishWIthEmbedViewSources.xproj", "{E3462190-3068-40F0-9AA5-34779FE252AC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PublishWIthEmbedViewSources", "PublishWIthEmbedViewSources\PublishWIthEmbedViewSources.csproj", "{E3462190-3068-40F0-9AA5-34779FE252AC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StrongNamedApp", "testapps\StrongNamedApp\StrongNamedApp.xproj", "{88903BE5-0676-4667-8160-B24646E0B76E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StrongNamedApp", "StrongNamedApp\StrongNamedApp.csproj", "{88903BE5-0676-4667-8160-B24646E0B76E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleAppDesktopOnly", "testapps\SimpleAppDesktopOnly\SimpleAppDesktopOnly.xproj", "{A0B0A141-A32B-4F33-B85F-5CA8C107105F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleAppDesktopOnly", "SimpleAppDesktopOnly\SimpleAppDesktopOnly.csproj", "{A0B0A141-A32B-4F33-B85F-5CA8C107105F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/version.props b/version.props index 4b3e632..7fa6682 100644 --- a/version.props +++ b/version.props @@ -2,6 +2,6 @@ 1.1.0 - preview4 + preview5 \ No newline at end of file