Merge remote-tracking branch 'MvcPrecompilation/rybrande/release22ToSrc' into rybrande/Mondo2.2

src/MvcPrecompilation/Directory.Build.props

@@ -14,7 +14,6 @@
     <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
-    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 </Project>

src/MvcPrecompilation/Directory.Build.targets

@@ -1,7 +1,10 @@
-<Project>
+<Project>
   <PropertyGroup>
     <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
     <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
     <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
+    <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
+    <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
   </PropertyGroup>
 </Project>

src/MvcPrecompilation/RazorViewCompilation.sln

@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2036
 MinimumVisualStudioVersion = 15.0.26730.03
@@ -46,8 +46,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StrongNamedApp", "testapps\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithParseErrors", "testapps\ApplicationWithParseErrors\ApplicationWithParseErrors.csproj", "{AF647059-B86B-46DD-9559-E1324A39B148}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationUsingRelativePaths", "testapps\ApplicationUsingRelativePaths\ApplicationUsingRelativePaths.csproj", "{0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithConfigureMvc", "testapps\ApplicationWithConfigureMvc\ApplicationWithConfigureMvc.csproj", "{559FBB83-40BC-47AF-A224-312CF8E3629B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithCustomInputFiles", "testapps\ApplicationWithCustomInputFiles\ApplicationWithCustomInputFiles.csproj", "{8F73A290-BCE1-461A-9970-397FFBFCC902}"
@@ -177,18 +175,6 @@ Global
 		{AF647059-B86B-46DD-9559-E1324A39B148}.Release|x64.Build.0 = Release|Any CPU
 		{AF647059-B86B-46DD-9559-E1324A39B148}.Release|x86.ActiveCfg = Release|Any CPU
 		{AF647059-B86B-46DD-9559-E1324A39B148}.Release|x86.Build.0 = Release|Any CPU
-		{0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Debug|x64.Build.0 = Debug|Any CPU
-		{0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Debug|x86.Build.0 = Debug|Any CPU
-		{0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Release|x64.ActiveCfg = Release|Any CPU
-		{0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Release|x64.Build.0 = Release|Any CPU
-		{0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Release|x86.ActiveCfg = Release|Any CPU
-		{0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Release|x86.Build.0 = Release|Any CPU
 		{559FBB83-40BC-47AF-A224-312CF8E3629B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{559FBB83-40BC-47AF-A224-312CF8E3629B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{559FBB83-40BC-47AF-A224-312CF8E3629B}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -310,7 +296,6 @@ Global
 		{7EFC460A-8BAA-4538-8EBE-0B3BB6101E94} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7}
 		{87C6A03D-1655-4D1C-82E5-8F553BF4096D} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7}
 		{AF647059-B86B-46DD-9559-E1324A39B148} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7}
-		{0B512D79-AA53-4C97-91B3-B0F8B2CA16B8} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7}
 		{559FBB83-40BC-47AF-A224-312CF8E3629B} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7}
 		{8F73A290-BCE1-461A-9970-397FFBFCC902} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7}
 		{196EF313-71CB-47A9-A77D-AACAF62881A1} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7}

src/MvcPrecompilation/build/dependencies.props

@@ -2,38 +2,32 @@
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
-
+  <PropertyGroup Label="Package Versions">
-  <!-- These package versions may be overridden or updated by automation. -->
+    <InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-20180928.5</InternalAspNetCoreSdkPackageVersion>
-  <PropertyGroup Label="Package Versions: Auto">
+    <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.2.0-preview3-35359</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
-    <InternalAspNetCoreSdkPackageVersion>2.1.3-rtm-15802</InternalAspNetCoreSdkPackageVersion>
+    <MicrosoftAspNetCoreHostingPackageVersion>2.2.0-preview3-35359</MicrosoftAspNetCoreHostingPackageVersion>
+    <MicrosoftAspNetCoreMvcPackageVersion>2.2.0-preview3-35359</MicrosoftAspNetCoreMvcPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorPagesPackageVersion>2.2.0-preview3-35359</MicrosoftAspNetCoreMvcRazorPagesPackageVersion>
+    <MicrosoftAspNetCoreRazorDesignPackageVersion>2.2.0-preview3-35359</MicrosoftAspNetCoreRazorDesignPackageVersion>
+    <MicrosoftAspNetCoreRazorRuntimePackageVersion>2.2.0-preview3-35359</MicrosoftAspNetCoreRazorRuntimePackageVersion>
+    <MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.6.0-preview3-35359</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
+    <MicrosoftAspNetCoreServerKestrelPackageVersion>2.2.0-preview3-35359</MicrosoftAspNetCoreServerKestrelPackageVersion>
+    <MicrosoftAspNetCoreTestingPackageVersion>2.2.0-preview3-35359</MicrosoftAspNetCoreTestingPackageVersion>
     <MicrosoftBuildTasksCorePackageVersion>15.6.82</MicrosoftBuildTasksCorePackageVersion>
-    <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
+    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.2.0-preview3-35359</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
-    <MicrosoftNETCoreApp21PackageVersion>2.1.2</MicrosoftNETCoreApp21PackageVersion>
+    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>2.2.0-preview3-35359</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
+    <MicrosoftExtensionsLoggingConsolePackageVersion>2.2.0-preview3-35359</MicrosoftExtensionsLoggingConsolePackageVersion>
+    <MicrosoftExtensionsLoggingPackageVersion>2.2.0-preview3-35359</MicrosoftExtensionsLoggingPackageVersion>
+    <MicrosoftExtensionsLoggingTestingPackageVersion>2.2.0-preview3-35359</MicrosoftExtensionsLoggingTestingPackageVersion>
+    <MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
+    <MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion>
+    <MicrosoftNETCoreApp22PackageVersion>2.2.0-preview3-26927-02</MicrosoftNETCoreApp22PackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>2.2.0-preview3-35359</MicrosoftNETSdkRazorPackageVersion>
     <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
     <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
     <XunitPackageVersion>2.3.1</XunitPackageVersion>
-    <XunitRunnerVisualStudioPackageVersion>2.4.0-beta.1.build3945</XunitRunnerVisualStudioPackageVersion>
+    <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
   </PropertyGroup>
-
-  <!-- This may import a generated file which may override the variables above. -->
   <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
-
+  <PropertyGroup Label="Package Versions: Pinned" />
-  <!-- These are package versions that should not be overridden or updated by automation. -->
+</Project>
-  <PropertyGroup Label="Package Versions: Pinned">
-    <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.1.1</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
-    <MicrosoftAspNetCoreHostingPackageVersion>2.1.1</MicrosoftAspNetCoreHostingPackageVersion>
-    <MicrosoftAspNetCoreMvcPackageVersion>2.1.1</MicrosoftAspNetCoreMvcPackageVersion>
-    <MicrosoftAspNetCoreMvcRazorPagesPackageVersion>2.1.1</MicrosoftAspNetCoreMvcRazorPagesPackageVersion>
-    <MicrosoftAspNetCoreRazorDesignPackageVersion>2.1.1</MicrosoftAspNetCoreRazorDesignPackageVersion>
-    <MicrosoftAspNetCoreRazorRuntimePackageVersion>2.1.1</MicrosoftAspNetCoreRazorRuntimePackageVersion>
-    <MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.5.1</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
-    <MicrosoftAspNetCoreServerKestrelPackageVersion>2.1.2</MicrosoftAspNetCoreServerKestrelPackageVersion>
-    <MicrosoftAspNetCoreTestingPackageVersion>2.1.0</MicrosoftAspNetCoreTestingPackageVersion>
-    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.1.1</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
-    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>2.1.1</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
-    <MicrosoftExtensionsLoggingConsolePackageVersion>2.1.1</MicrosoftExtensionsLoggingConsolePackageVersion>
-    <MicrosoftExtensionsLoggingPackageVersion>2.1.1</MicrosoftExtensionsLoggingPackageVersion>
-    <MicrosoftExtensionsLoggingTestingPackageVersion>2.1.1</MicrosoftExtensionsLoggingTestingPackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>2.1.1</MicrosoftNETSdkRazorPackageVersion>
-  </PropertyGroup>
-</Project>

src/MvcPrecompilation/build/repo.props

@@ -4,12 +4,13 @@
   <PropertyGroup>
     <!-- These properties are use by the automation that updates dependencies.props -->
     <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
-    <LineupPackageVersion>2.1.0-rc1-*</LineupPackageVersion>
+    <LineupPackageVersion>2.2.0-*</LineupPackageVersion>
     <LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource>
   </PropertyGroup>
 
   <ItemGroup>
     <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
     <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
+    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
   </ItemGroup>
 </Project>

src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompileRunCommand.cs

@@ -179,7 +179,9 @@ namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Internal
             // Post process the compilation - run ExpressionRewritter and any user specified callbacks.            
             compilation = ExpressionRewriter.Rewrite(compilation);
             var compilationContext = new RoslynCompilationContext(compilation);
+#pragma warning disable CS0618 // Type or member is obsolete
             MvcServiceProvider.ViewEngineOptions.CompilationCallback(compilationContext);
+#pragma warning restore CS0618 // Type or member is obsolete
             compilation  = AssemblyMetadataGenerator.AddAssemblyMetadata(
                 compiler, 
                 compilationContext.Compilation,

src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj

@@ -13,15 +13,6 @@
     <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)'=='net461'">
-    <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers>
-    <PlatformTarget Condition="'$(Platform)'=='AnyCPU'">x86</PlatformTarget>
-    <AssemblyName>$(AssemblyName)-$(PlatformTarget)</AssemblyName>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <OutputPath>bin\$(Configuration)\net461\win7-$(PlatformTarget)</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\net461\win7-$(PlatformTarget)</IntermediateOutputPath>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="$(TasksProjectDirectory)Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.csproj" PrivateAssets="true" ReferenceOutputAssembly="false" />
 
@@ -31,22 +22,41 @@
     <PackageReference Update="Microsoft.NETCore.App" PrivateAssets="All" />
   </ItemGroup>
 
-  <Target Name="BuildX64" AfterTargets="Build" Condition="'$(TargetFramework)'=='net461' AND '$(PlatformTarget)'!='x64'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
+    <SignedPackageFile Include="$(TargetPath)" PackagePath="build/netstandard2.0/netcoreapp2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.dll" Certificate="$(AssemblySigningCertName)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+    <SignedPackageFile Include="$(TargetDir)\$(AssemblyName)-x86.exe" PackagePath="build/netstandard2.0/net461/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation-x86.exe" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="$(TargetDir)\$(AssemblyName).exe" PackagePath="build/netstandard2.0/net461/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.exe" Certificate="$(AssemblySigningCertName)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == ''">
+    <SignedPackageFile Include="$(TasksProjectDirectory)bin\$(Configuration)\netstandard2.0\$(AssemblyName).Tasks.dll;" PackagePath="build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.dll" Certificate="$(AssemblySigningCertName)" />
+  </ItemGroup>
+
+  <Target Name="BuildX86" AfterTargets="Build" Condition="'$(TargetFramework)'=='net461' AND '$(PlatformTarget)'!='x86'">
     <MSBuild
       Projects="$(MSBuildProjectFullPath)"
       Targets="Build"
       Properties="
         Configuration=$(Configuration);
-        TargetFramework=net461;
+        TargetFramework=$(TargetFramework);
-        Platform=x64;" />
+        Platform=x86;
+        BuildNumber=$(BuildNumber);
+        OutputPath=$(OutputPath);
+        TargetName=$(TargetName)-x86" />
   </Target>
 
-  <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="BuildX64;">
+  <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="BuildX86">
 
     <PropertyGroup>
       <!-- Make sure we create a symbols.nupkg. -->
       <IncludeSymbols>true</IncludeSymbols>
 
+      <!-- RepositoryCommit is only available when "build" runs, but not during dotnet pack -->
+      <RepositoryCommit Condition="'$(RepositoryCommit)' == ''">unknown</RepositoryCommit>
+
       <NuspecProperties>
         id=$(PackageId);
         version=$(PackageVersion);
@@ -68,10 +78,10 @@
         TaskBinary=$(TasksProjectDirectory)bin\$(Configuration)\netstandard2.0\$(AssemblyName).Tasks.dll;
         TaskSymbol=$(TasksProjectDirectory)bin\$(Configuration)\netstandard2.0\$(AssemblyName).Tasks.pdb;
 
-        OutputExeX86=$(OutputPath)net461\win7-x86\$(AssemblyName)-x86.exe;
+        OutputExeX86=$(OutputPath)net461\$(AssemblyName)-x86.exe;
-        OutputExeSymbolX86=$(OutputPath)net461\win7-x86\$(AssemblyName)-x86.pdb;
+        OutputExeSymbolX86=$(OutputPath)net461\$(AssemblyName)-x86.pdb;
-        OutputExeX64=$(OutputPath)net461\win7-x64\$(AssemblyName)-x64.exe;
+        OutputExeAnyCPU=$(OutputPath)net461\$(AssemblyName).exe;
-        OutputExeSymbolX64=$(OutputPath)net461\win7-x64\$(AssemblyName)-x64.pdb;
+        OutputExeSymbolAnyCPU=$(OutputPath)net461\$(AssemblyName).pdb;
       </NuspecProperties>
     </PropertyGroup>
   </Target>

src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.nuspec

@@ -26,13 +26,17 @@
 
   <files>
     <file src="build\**\*" target="build\" />
-    <file src="$OutputBinary$" target="build\netstandard2.0\$AssemblyName$.dll" />
+
-    <file src="$OutputSymbol$" target="build\netstandard2.0\$AssemblyName$.pdb" />
+    <file src="$OutputBinary$" target="build\netstandard2.0\netcoreapp2.0\" />
+    <file src="$OutputSymbol$" target="build\netstandard2.0\netcoreapp2.0\" />
+
+    <file src="$OutputExeX86$" target="build\netstandard2.0\net461\" />
+    <file src="$OutputExeSymbolX86$" target="build\netstandard2.0\net461\" />
+
+    <file src="$OutputExeAnyCPU$" target="build\netstandard2.0\net461\" />
+    <file src="$OutputExeSymbolAnyCPU$" target="build\netstandard2.0\net461\" />
+
     <file src="$TaskBinary$" target="build\netstandard2.0\$AssemblyName$.Tasks.dll" />
     <file src="$TaskSymbol$" target="build\netstandard2.0\$AssemblyName$.Tasks.pdb" />
-    <file src="$OutputExeX86$" target="build\netstandard2.0\" />
-    <file src="$OutputExeSymbolX86$" target="build\netstandard2.0\" />
-    <file src="$OutputExeX64$" target="build\netstandard2.0\" />
-    <file src="$OutputExeSymbolX64$" target="build\netstandard2.0\" />
   </files>
 </package>

src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets

@@ -51,7 +51,8 @@
 
     <PropertyGroup>
       <MvcRazorRunCommand Condition="'$(MvcRazorRunCommand)'==''">dotnet</MvcRazorRunCommand>
-      <_MvcViewCompilationBinaryPath Condition="'$(_MvcViewCompilationBinaryPath)'==''">$(MSBuildThisFileDirectory)$(MSBuildThisFileName).dll</_MvcViewCompilationBinaryPath>
+      <_MvcViewCompilationBinariesDir Condition="'$(_MvcViewCompilationBinariesDir)' == ''">$(MSBuildThisFileDirectory)</_MvcViewCompilationBinariesDir>
+      <_MvcViewCompilationBinaryPath>$(_MvcViewCompilationBinariesDir)netcoreapp2.0\$(MSBuildThisFileName).dll</_MvcViewCompilationBinaryPath>
 
       <ExecArgs>&quot;$(MvcRazorRunCommand)&quot; exec</ExecArgs>
       <ExecArgs>$(ExecArgs) --runtimeconfig &quot;$(ProjectRuntimeConfigFilePath)&quot;</ExecArgs>
@@ -79,17 +80,19 @@
       Targets="Build;MvcRazorPrecompile" />
   </Target>
 
+  <Target Name="_ResolveBinaryPath">
+    <PropertyGroup>
+      <_MvcViewCompilationBinariesDir Condition="'$(_MvcViewCompilationBinariesDir)' == ''">$(MSBuildThisFileDirectory)</_MvcViewCompilationBinariesDir>
+
+      <_MvcViewCompilationBinaryPath Condition="'$(PlatformTarget)'=='x86'">$(_MvcViewCompilationBinariesDir)net461\$(MSBuildThisFileName)-x86.exe</_MvcViewCompilationBinaryPath>
+      <_MvcViewCompilationBinaryPath Condition="'$(PlatformTarget)'!='x86'">$(_MvcViewCompilationBinariesDir)net461\$(MSBuildThisFileName).exe</_MvcViewCompilationBinaryPath>
+    </PropertyGroup>
+  </Target>
+
   <Target
     Name="_AddDesktopReferences"
     AfterTargets="ResolveLockFileReferences"
-    Condition="'$(MvcRazorCompileOnPublish)'=='true' AND '$(_MvcViewCompilationAddDesktopReferences)'!='false' AND '$(TargetFrameworkIdentifier)'=='.NETFramework'">
+    Condition="'$(MvcRazorCompileOnPublish)'=='true' AND '$(ResolvedRazorCompileToolset)'=='PrecompilationTool' AND '$(TargetFrameworkIdentifier)'=='.NETFramework'">
-
-    <PropertyGroup Condition="'$(_MvcViewCompilationBinaryPath)'==''">
-      <_MvcViewCompilationBinaryPath Condition="'$(PlatformTarget)'=='x86'">$(MSBuildThisFileDirectory)$(MSBuildThisFileName)-x86.exe</_MvcViewCompilationBinaryPath>
-
-      <!-- For PlatformTarget = AnyCPU or x64, we will use the x64 binary -->
-      <_MvcViewCompilationBinaryPath Condition="'$(_MvcViewCompilationBinaryPath)'==''">$(MSBuildThisFileDirectory)$(MSBuildThisFileName)-x64.exe</_MvcViewCompilationBinaryPath>
-    </PropertyGroup>
 
     <ItemGroup Condition="'$(_MvcViewCompilationBinaryPath)'!=''">
       <Reference Include="$(_MvcViewCompilationBinaryPath)" Private="false" Visible="false" />
@@ -98,7 +101,7 @@
 
   <Target
     Name="_RunForDesktop"
-    DependsOnTargets="_AddDesktopReferences;_CreateResponseFileForMvcRazorPrecompile"
+    DependsOnTargets="_ResolveBinaryPath;_AddDesktopReferences;_CreateResponseFileForMvcRazorPrecompile"
     Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'">
 
     <PropertyGroup>
@@ -165,11 +168,11 @@
      Name="_MvcRazorPrecompileOnPublish"
      DependsOnTargets="MvcRazorPrecompile"
      AfterTargets="PrepareForPublish"
-     Condition="'$(ResolvedRazorCompileToolset)'=='PrecompilationTool'and '$(MvcRazorCompileOnPublish)'=='true'" />
+     Condition="'$(ResolvedRazorCompileToolset)'=='PrecompilationTool' and '$(MvcRazorCompileOnPublish)'=='true'" />
 
   <Target Name="_MvcRazorResolveFilesToCompute"
     AfterTargets="ComputeRefAssembliesToPublish"
-    Condition="'$(ResolvedRazorCompileToolset)'=='PrecompilationTool'and '$(MvcRazorCompileOnPublish)'=='true'">
+    Condition="'$(ResolvedRazorCompileToolset)'=='PrecompilationTool' and '$(MvcRazorCompileOnPublish)'=='true'">
 
     <PropertyGroup>
       <_MvcRazorOutputPdbFullPath>$([System.IO.Path]::ChangeExtension('$(_MvcRazorOutputFullPath)', '.pdb'))</_MvcRazorOutputPdbFullPath>

src/MvcPrecompilation/test/Directory.Build.props

@@ -1,10 +1,10 @@
-<Project>
+<Project>
   <Import Project="..\Directory.Build.props" />
 
   <PropertyGroup>
-    <DeveloperBuildTestTfms>netcoreapp2.1</DeveloperBuildTestTfms>
+    <DeveloperBuildTestTfms>netcoreapp2.2</DeveloperBuildTestTfms>
     <StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
-    <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' ">netcoreapp2.1;netcoreapp2.0</StandardTestTfms>
+
     <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>
   </PropertyGroup>
 

src/MvcPrecompilation/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs

@@ -8,10 +8,8 @@ namespace FunctionalTests
     public class CoreCLRApplicationTestFixture<TStartup> : ApplicationTestFixture
     {
         private const string TargetFramework =
-#if NETCOREAPP2_0
+#if NETCOREAPP2_2
-            "netcoreapp2.0";
+            "netcoreapp2.2";
-#elif NETCOREAPP2_1
-            "netcoreapp2.1";
 #else
 #error Target frameworks need to be updated
 #endif

src/MvcPrecompilation/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs

@@ -1,7 +1,6 @@
 // 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.IO;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;

src/MvcPrecompilation/test/FunctionalTests/FunctionalTests.csproj

@@ -6,15 +6,16 @@
     <DefineConstants>$(DefineConstants);__remove_this_to__GENERATE_BASELINES</DefineConstants>
     <DefineConstants Condition="'$(GenerateBaseLines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
     <SignAssembly>false</SignAssembly>
-    <PublicSign>false</PublicSign>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+
+    <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net461'">win7-x64</RuntimeIdentifier>
   </PropertyGroup>
 
   <ItemGroup>
     <EmbeddedResource Include="Resources\*" />
     <Compile Include="Infrastructure\*.cs" />
     <Compile Include="DesktopTests\*.cs" Condition="'$(TargetFramework)'=='net461'" />
-    <Compile Include="CoreCLRTests\*.cs" Condition="'$(TargetFramework)'=='netcoreapp2.0' OR '$(TargetFramework)'=='netcoreapp2.1'" />
+    <Compile Include="CoreCLRTests\*.cs" Condition="'$(TargetFramework)'=='netcoreapp2.2'" />
   </ItemGroup>
 
   <ItemGroup>
@@ -32,7 +33,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\testapps\ApplicationUsingRelativePaths\ApplicationUsingRelativePaths.csproj" />
     <ProjectReference Include="..\..\testapps\ApplicationWithConfigureMvc\ApplicationWithConfigureMvc.csproj" />
     <ProjectReference Include="..\..\testapps\ApplicationWithCustomInputFiles\ApplicationWithCustomInputFiles.csproj" />
     <ProjectReference Include="..\..\testapps\ApplicationWithParseErrors\ApplicationWithParseErrors.csproj" />

src/MvcPrecompilation/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs

@@ -3,9 +3,12 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 
 namespace FunctionalTests
@@ -13,28 +16,44 @@ namespace FunctionalTests
     public abstract class ApplicationTestFixture : IDisposable
     {
         private const string DotnetCLITelemetryOptOut = "DOTNET_CLI_TELEMETRY_OPTOUT";
-        private static readonly SemaphoreSlim _deploymentLock = new SemaphoreSlim(initialCount: 1);
+        private static readonly string SolutionDirectory;
+
         private Task<DeploymentResult> _deploymentTask;
-        private IApplicationDeployer _deployer;
+        private ApplicationDeployer _deployer;
+
+        static ApplicationTestFixture()
+        {
+            SolutionDirectory = TestPathUtilities.GetSolutionRootDirectory("RazorViewCompilation");
+            if (!SolutionDirectory.EndsWith(Path.DirectorySeparatorChar.ToString()))
+            {
+                SolutionDirectory += Path.DirectorySeparatorChar;
+            }
+        }
 
         protected ApplicationTestFixture(string applicationName, string applicationPath)
         {
             ApplicationName = applicationName;
             ApplicationPath = applicationPath ?? ApplicationPaths.GetTestAppDirectory(applicationName);
+            WorkingDirectory = Path.Combine(Path.GetTempPath(), "PrecompilationTool", Path.GetRandomFileName());
+            TestProjectDirectory = Path.Combine(WorkingDirectory, ApplicationName);
         }
 
         public string ApplicationName { get; }
 
         public string ApplicationPath { get; }
 
+        public string WorkingDirectory { get; }
+
+        public string TestProjectDirectory { get; }
+
         public bool PublishOnly { get; set; }
 
         protected abstract DeploymentParameters GetDeploymentParameters();
 
         protected DeploymentParameters GetDeploymentParameters(RuntimeFlavor flavor, string targetFramework)
-            => GetDeploymentParameters(ApplicationPath, ApplicationName, flavor, targetFramework);
+            => GetDeploymentParameters(TestProjectDirectory, ApplicationName, flavor, targetFramework);
 
-        public static DeploymentParameters GetDeploymentParameters(string applicationPath, string applicationName, RuntimeFlavor flavor, string targetFramework)
+        private static DeploymentParameters GetDeploymentParameters(string applicationPath, string applicationName, RuntimeFlavor flavor, string targetFramework)
         {
             // This determines the configuration of the the test project and consequently the configuration the src projects are most likely built in.
             var projectConfiguration =
@@ -53,16 +72,19 @@ namespace FunctionalTests
                 RuntimeArchitecture.x64)
             {
                 ApplicationName = applicationName,
+                ApplicationType = flavor == RuntimeFlavor.Clr ? ApplicationType.Standalone : ApplicationType.Portable,
                 PublishApplicationBeforeDeployment = true,
-                Configuration = "Release",
+                Configuration = projectConfiguration,
                 EnvironmentVariables =
                 {
                     new KeyValuePair<string, string>(DotnetCLITelemetryOptOut, "1"),
+                    new KeyValuePair<string, string>("SolutionDirectory", SolutionDirectory),
                     new KeyValuePair<string, string>("SolutionConfiguration", projectConfiguration),
                 },
                 PublishEnvironmentVariables =
                 {
                     new KeyValuePair<string, string>(DotnetCLITelemetryOptOut, "1"),
+                    new KeyValuePair<string, string>("SolutionDirectory", SolutionDirectory),
                     new KeyValuePair<string, string>("SolutionConfiguration", projectConfiguration),
                 },
                 TargetFramework = targetFramework,
@@ -78,35 +100,89 @@ namespace FunctionalTests
                 _deploymentTask.Result.HttpClient?.Dispose();
             }
 
+            CleanupWorkingDirectory();
+
             _deployer?.Dispose();
         }
 
-        public async Task<DeploymentResult> CreateDeploymentAsync(ILoggerFactory loggerFactory)
+        public Task<DeploymentResult> CreateDeploymentAsync(ILoggerFactory loggerFactory)
         {
-            try
+            if (_deploymentTask == null)
             {
-                await _deploymentLock.WaitAsync(TimeSpan.FromSeconds(10));
+                _deploymentTask = CreateDeploymentAsyncCore(loggerFactory);
-                if (_deploymentTask == null)
+            }
-                {
-                    var deploymentParameters = GetDeploymentParameters();
-                    if (PublishOnly)
-                    {
-                        _deployer = new PublishOnlyDeployer(deploymentParameters, loggerFactory);
-                    }
-                    else
-                    {
-                        _deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory);
-                    }
 
-                    _deploymentTask = _deployer.DeployAsync();
+            return _deploymentTask;
+        }
+
+        protected virtual Task<DeploymentResult> CreateDeploymentAsyncCore(ILoggerFactory loggerFactory)
+        {
+            CopyDirectory(new DirectoryInfo(ApplicationPath), new DirectoryInfo(TestProjectDirectory));
+
+            File.Copy(Path.Combine(SolutionDirectory, "global.json"), Path.Combine(TestProjectDirectory, "global.json"));
+            File.Copy(Path.Combine(ApplicationPath, "..", "Directory.Build.props"), Path.Combine(TestProjectDirectory, "Directory.Build.props"));
+            File.Copy(Path.Combine(ApplicationPath, "..", "Directory.Build.targets"), Path.Combine(TestProjectDirectory, "Directory.Build.targets"));
+
+            var deploymentParameters = GetDeploymentParameters();
+            if (PublishOnly)
+            {
+                _deployer = new PublishOnlyDeployer(deploymentParameters, loggerFactory);
+            }
+            else
+            {
+                _deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory);
+            }
+
+            return _deployer.DeployAsync();
+        }
+
+        public void CopyDirectory(DirectoryInfo source, DirectoryInfo destination, bool recursive = true)
+        {
+            // Recurse into subdirectories
+            foreach (var directory in source.EnumerateDirectories())
+            {
+                if (directory.Name == "bin")
+                {
+                    continue;
+                }
+
+                var created = destination.CreateSubdirectory(directory.Name);
+
+                // We only want to copy the restore artifacts from obj directory while ignoring in any configuration specific directories
+                CopyDirectory(directory, created, recursive: directory.Name != "obj");
+            }
+
+            foreach (var file in source.EnumerateFiles())
+            {
+                file.CopyTo(Path.Combine(destination.FullName, file.Name));
+            }
+        }
+
+        private void CleanupWorkingDirectory()
+        {
+            var tries = 5;
+            var sleep = TimeSpan.FromSeconds(3);
+
+            for (var i = 0; i < tries; i++)
+            {
+                try
+                {
+                    if (Directory.Exists(WorkingDirectory))
+                    {
+                        Directory.Delete(WorkingDirectory, recursive: true);
+                    }
+                    return;
+                }
+                catch when (i < tries - 1)
+                {
+                    Console.WriteLine($"Failed to delete directory {TestProjectDirectory}, trying again.");
+                    Thread.Sleep(sleep);
+                }
+                catch
+                {
+                    // Do nothing
                 }
             }
-            finally
-            {
-                _deploymentLock.Release();
-            }
-
-            return await _deploymentTask;
         }
     }
 }

src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
-
-    <MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
-  </ItemGroup>
-
-</Project>

src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Controllers/HomeController.cs

@@ -1,19 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace ApplicationUsingRelativePaths.Controllers
-{
-    public class HomeController : Controller
-    {
-        public IActionResult Index()
-        {
-            return View("Views/Home/Index.cshtml");
-        }
-
-        public IActionResult About()
-        {
-            ViewData["Message"] = "Your application description page.";
-
-            return View();
-        }
-    }
-}

src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Program.cs

@@ -1,26 +0,0 @@
-using System.IO;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-
-namespace ApplicationUsingRelativePaths
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            var config = new ConfigurationBuilder()
-                .AddCommandLine(args)
-                .AddEnvironmentVariables(prefix: "ASPNETCORE_")
-                .Build();
-
-            var host = new WebHostBuilder()
-                .UseConfiguration(config)
-                .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseStartup<Startup>()
-                .Build();
-
-            host.Run();
-        }
-    }
-}

src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Startup.cs

@@ -1,21 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-
-namespace ApplicationUsingRelativePaths
-{
-    public class Startup
-    {
-        public void ConfigureServices(IServiceCollection services)
-        {
-            // Add framework services.
-            services.AddMvc();
-        }
-
-        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
-        {
-            loggerFactory.AddConsole();
-            app.UseMvcWithDefaultRoute();
-        }
-    }
-}

src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Views/Home/About.cshtml

@@ -1,8 +0,0 @@
-@{
-    Layout = "../Shared/_Layout.cshtml";
-    ViewData["Title"] = "About";
-}
-<h2>@ViewData["Title"].</h2>
-<h3>@ViewData["Message"]</h3>
-
-<p>Use this area to provide additional information.</p>

src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Views/Home/Index.cshtml

@@ -1,6 +0,0 @@
-@{
-    ViewData["Title"] = "Home Page";
-}
-
-@GetType().Assembly.FullName
-Hello from Index!

src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Views/Shared/_Layout.cshtml

@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-    @RenderBody()
-</body>
-</html>

src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Views/_ViewImports.cshtml

@@ -1,2 +0,0 @@
-@using ApplicationUsingRelativePaths
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Views/_ViewStart.cshtml

@@ -1,3 +0,0 @@
-@{
-    Layout = "Shared/_Layout.cshtml";
-}

src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Startup.cs

@@ -9,6 +9,7 @@ namespace ApplicationWithConfigureStartup
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             var builder = services.AddMvc();
             ConfigureMvc(builder);
@@ -16,7 +17,6 @@ namespace ApplicationWithConfigureStartup
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvc(routes =>
             {
                 routes.MapRoute(
@@ -29,8 +29,10 @@ namespace ApplicationWithConfigureStartup
         {
             builder.AddRazorOptions(options =>
             {
+#pragma warning disable CS0618 // Type or member is obsolete
                 var callback = options.CompilationCallback;
                 options.CompilationCallback = context =>
+#pragma warning restore CS0618 // Type or member is obsolete
                 {
                     callback(context);
                     foreach (var tree in context.Compilation.SyntaxTrees)

src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Startup.cs

@@ -8,13 +8,13 @@ namespace ApplicationWithCustomInputFiles
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvc(routes =>
             {
                 routes.MapRoute(

src/MvcPrecompilation/testapps/ApplicationWithParseErrors/Startup.cs

@@ -8,12 +8,12 @@ namespace ApplicationWithParseErrors
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvcWithDefaultRoute();
         }
     }

src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Startup.cs

@@ -8,13 +8,13 @@ namespace ApplicationWithRazorSdkNeitherUsed
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvcWithDefaultRoute();
         }
     }

src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs

@@ -8,13 +8,13 @@ namespace ApplicationWithRazorSdkPrecompilationUsed
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvcWithDefaultRoute();
         }
     }

src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Startup.cs

@@ -8,13 +8,13 @@ namespace ApplicationWithRazorSdkUsed
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvcWithDefaultRoute();
         }
     }

src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Startup.cs

@@ -8,13 +8,13 @@ namespace ApplicationWithTagHelpers
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvc(routes =>
             {
                 routes.MapRoute(

src/MvcPrecompilation/testapps/Directory.Build.props

@@ -1,17 +1,23 @@
 <Project>
-  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <SolutionDirectory Condition="'$(SolutionDirectory)'==''">$(MSBuildThisFileDirectory)..\</SolutionDirectory>
+  </PropertyGroup>
+
+  <Import Project="$(SolutionDirectory)Directory.Build.props" />
 
   <PropertyGroup>
-    <DeveloperBuildTestAppTfms>netcoreapp2.1</DeveloperBuildTestAppTfms>
+    <DeveloperBuildTestAppTfms>netcoreapp2.2</DeveloperBuildTestAppTfms>
     <StandardTestAppTfms>$(DeveloperBuildTestAppTfms)</StandardTestAppTfms>
-    <StandardTestAppTfms Condition=" '$(DeveloperBuild)' != 'true' ">netcoreapp2.1;netcoreapp2.0</StandardTestAppTfms>
+    <StandardTestAppTfms Condition=" '$(DeveloperBuild)' != 'true' ">netcoreapp2.2;netcoreapp2.0</StandardTestAppTfms>
     <StandardTestAppTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestAppTfms);net461</StandardTestAppTfms>
+
+    <!-- Bug in SelfHostDeployer prevents desktop applications from being published without a rid. -->
+    <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net461'">win7-x64</RuntimeIdentifier>
   </PropertyGroup>
 
   <PropertyGroup>
     <!-- Override some repo-level properties not required for tests. -->
     <Version>1.0.0</Version>
     <SignAssembly>false</SignAssembly>
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">false</PublicSign>
   </PropertyGroup>
 </Project>

src/MvcPrecompilation/testapps/Directory.Build.targets

@@ -1,23 +1,13 @@
 <Project>
-  <Import Project="..\Directory.Build.targets" />
+  <Import Project="$(SolutionDirectory)Directory.Build.targets" />
 
   <PropertyGroup>
-    <_MvcViewCompilationAddDesktopReferences>false</_MvcViewCompilationAddDesktopReferences>
     <TestIncludeViewCompilationTargets Condition="'$(TestIncludeViewCompilationTargets)'==''">$(MvcRazorCompileOnPublish)</TestIncludeViewCompilationTargets>
     <SolutionConfiguration Condition="'$(SolutionConfiguration)'==''">$(Configuration)</SolutionConfiguration>
-    <_MvcViewCompilationTasksPath>$(MSBuildThisFileDirectory)..\src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks\bin\$(SolutionConfiguration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.dll</_MvcViewCompilationTasksPath>
+    <_MvcViewCompilationTasksPath>$(SolutionDirectory)src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks\bin\$(SolutionConfiguration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.dll</_MvcViewCompilationTasksPath>
+    <_MvcViewCompilationBinariesDir>$(SolutionDirectory)src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation\bin\$(SolutionConfiguration)\</_MvcViewCompilationBinariesDir>
   </PropertyGroup>
 
-  <Import Project="..\src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets"
+  <Import Project="$(SolutionDirectory)src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets"
     Condition="'$(TestIncludeViewCompilationTargets)'=='true'"/>
-
-  <Target
-    Name="SetMvcRazorViewCompilationBinaryPath"
-    BeforeTargets="MvcRazorPrecompile"
-    Condition="'$(TestIncludeViewCompilationTargets)'=='true'">
-    <PropertyGroup>
-      <_MvcViewCompilationBinaryPath Condition="'$(TargetFramework)'!='net461'">$(MSBuildThisFileDirectory)..\src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation\bin\$(SolutionConfiguration)\netcoreapp2.0\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.dll</_MvcViewCompilationBinaryPath>
-      <_MvcViewCompilationBinaryPath Condition="'$(TargetFramework)'=='net461'">$(MSBuildThisFileDirectory)..\src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation\bin\$(SolutionConfiguration)\net461\win7-x86\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation-x86.exe</_MvcViewCompilationBinaryPath>
-    </PropertyGroup>
-  </Target>
 </Project>

src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Startup.cs

@@ -8,13 +8,13 @@ namespace PublishWithEmbedViewSources
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvc(routes =>
             {
                 routes.MapRoute(

src/MvcPrecompilation/testapps/RazorPagesApp/Startup.cs

@@ -10,6 +10,7 @@ namespace RazorPagesApp
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             var builder = services.AddMvc();
             services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie(options => options.LoginPath = "/Login");
             ConfigureMvc(builder);
@@ -17,7 +18,6 @@ namespace RazorPagesApp
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseAuthentication();
             app.UseMvc();
         }

src/MvcPrecompilation/testapps/SimpleApp/SimpleApp.csproj

@@ -2,8 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
-    <RuntimeIdentifiers>win7-x86;debian-x64</RuntimeIdentifiers>
-
     <MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
   </PropertyGroup>
 

src/MvcPrecompilation/testapps/SimpleApp/Startup.cs

@@ -8,13 +8,13 @@ namespace SimpleApp
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvc(routes =>
             {
                 routes.MapRoute(

src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Startup.cs

@@ -8,13 +8,13 @@ namespace SimpleAppWithAssemblyRename
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvcWithDefaultRoute();
         }
     }

src/MvcPrecompilation/testapps/StrongNamedApp/Startup.cs

@@ -8,13 +8,13 @@ namespace StrongNamedApp
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvc(routes =>
             {
                 routes.MapRoute(

src/MvcPrecompilation/testapps/StrongNamedApp/StrongNamedApp.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
 
     <MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
   </PropertyGroup>

src/MvcPrecompilation/version.props

@@ -1,6 +1,6 @@
-<Project>
+<Project>
   <PropertyGroup>
-    <VersionPrefix>2.1.1</VersionPrefix>
+    <VersionPrefix>2.2.0</VersionPrefix>
     <VersionSuffix>rtm</VersionSuffix>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>