Integrate the new SDK (remove workarounds)
This commit is contained in:
parent
646b129a64
commit
176d27af5e
|
|
@ -3,8 +3,6 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
||||||
|
|
||||||
<!-- Workaround until we get a new SDK build -->
|
|
||||||
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
|
|
||||||
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,6 @@
|
||||||
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
||||||
<DefineConstants>$(DefineConstants);TEST123</DefineConstants>
|
<DefineConstants>$(DefineConstants);TEST123</DefineConstants>
|
||||||
|
|
||||||
<!-- Workaround until we get a new SDK build -->
|
|
||||||
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
|
|
||||||
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,6 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
||||||
|
|
||||||
<!-- Workaround until we get a new SDK build -->
|
|
||||||
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
|
|
||||||
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
||||||
<MvcRazorEmbedViewSources>true</MvcRazorEmbedViewSources>
|
<MvcRazorEmbedViewSources>true</MvcRazorEmbedViewSources>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,6 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
||||||
|
|
||||||
<!-- Workaround until we get a new SDK build -->
|
|
||||||
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
|
|
||||||
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,6 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
||||||
|
|
||||||
<!-- Workaround until we get a new SDK build -->
|
|
||||||
<ResolvedRazorCompileToolset></ResolvedRazorCompileToolset>
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Turning off precompilation on will also turn off Razor SDK.
|
Turning off precompilation on will also turn off Razor SDK.
|
||||||
-->
|
-->
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,6 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
||||||
|
|
||||||
<!-- Workaround until we get a new SDK build -->
|
|
||||||
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Turning precompilation on will turn off Razor SDK.
|
Turning precompilation on will turn off Razor SDK.
|
||||||
-->
|
-->
|
||||||
|
|
|
||||||
|
|
@ -3,12 +3,6 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
||||||
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
||||||
|
|
||||||
<!-- Workaround until we get a new SDK build -->
|
|
||||||
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">RazorSDK</ResolvedRazorCompileToolset>
|
|
||||||
|
|
||||||
<!-- This will become the default for 2.1 soon -->
|
|
||||||
<RazorCompileOnPublish>true</RazorCompileOnPublish>
|
|
||||||
|
|
||||||
<!-- Use a different filename so we can tell the difference -->
|
<!-- Use a different filename so we can tell the difference -->
|
||||||
<RazorTargetName>ApplicationWithRazorSdkUsed.Views</RazorTargetName>
|
<RazorTargetName>ApplicationWithRazorSdkUsed.Views</RazorTargetName>
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,6 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
||||||
|
|
||||||
<!-- Workaround until we get a new SDK build -->
|
|
||||||
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
|
|
||||||
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,6 @@
|
||||||
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
||||||
<MvcRazorOutputPath Condition="'$(TargetFramework)'!=''">obj\precompiled\$(TargetFramework)</MvcRazorOutputPath>
|
<MvcRazorOutputPath Condition="'$(TargetFramework)'!=''">obj\precompiled\$(TargetFramework)</MvcRazorOutputPath>
|
||||||
|
|
||||||
<!-- Workaround until we get a new SDK build -->
|
|
||||||
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
|
|
||||||
<TestIncludeViewCompilationTargets>true</TestIncludeViewCompilationTargets>
|
<TestIncludeViewCompilationTargets>true</TestIncludeViewCompilationTargets>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,6 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
||||||
|
|
||||||
<!-- Workaround until we get a new SDK build -->
|
|
||||||
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
|
|
||||||
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
||||||
<MvcRazorEmbedViewSources>true</MvcRazorEmbedViewSources>
|
<MvcRazorEmbedViewSources>true</MvcRazorEmbedViewSources>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,6 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
||||||
|
|
||||||
<!-- Workaround until we get a new SDK build -->
|
|
||||||
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
|
|
||||||
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,6 @@
|
||||||
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
||||||
<RuntimeIdentifiers>win7-x86;debian-x64</RuntimeIdentifiers>
|
<RuntimeIdentifiers>win7-x86;debian-x64</RuntimeIdentifiers>
|
||||||
|
|
||||||
<!-- Workaround until we get a new SDK build -->
|
|
||||||
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
|
|
||||||
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,6 @@
|
||||||
<AssemblyName>NewAssemblyName</AssemblyName>
|
<AssemblyName>NewAssemblyName</AssemblyName>
|
||||||
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
|
||||||
|
|
||||||
<!-- Workaround until we get a new SDK build -->
|
|
||||||
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
|
|
||||||
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,7 @@
|
||||||
<SignAssembly>true</SignAssembly>
|
<SignAssembly>true</SignAssembly>
|
||||||
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
|
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
|
||||||
|
|
||||||
<!-- Workaround until we get a new SDK build -->
|
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
||||||
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
|
|
||||||
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue