Update dependencies and remove some unused version variable overrides (dotnet/razor#238)

natemcmaster · web-flow · commit 61e85256a653 · 2019-02-22T10:24:51.000-08:00
* Update dependencies * Add workaround for dotnet/sdkdotnet/aspnetcore-tooling#2976 * Remove unused NETStandard package version variable and overrides * Update xunit to 2.4.1 \n\nCommit migrated from dotnet/razor@6708297
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs
@@ -7,7 +7,6 @@ internal static partial class BuildVariables
     {
         private static string _msBuildPath = string.Empty;
         private static string _microsoftNETCoreApp30PackageVersion = string.Empty;
-        private static string _netStandardLibrary20PackageVersion = string.Empty;
 
         static partial void InitializeVariables();
 
@@ -28,14 +27,5 @@ public static string MicrosoftNETCoreApp30PackageVersion
                 return _microsoftNETCoreApp30PackageVersion;
             }
         }
-
-        public static string NETStandardLibrary20PackageVersion
-        {
-            get
-            {
-                InitializeVariables();
-                return _netStandardLibrary20PackageVersion;
-            }
-        }
     }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
@@ -74,7 +74,6 @@ internal Task<MSBuildResult> DotnetMSBuild(
                 "/p:RunningAsTest=true",
 
                 $"/p:MicrosoftNETCoreApp30PackageVersion={BuildVariables.MicrosoftNETCoreApp30PackageVersion}",
-                $"/p:NETStandardLibrary20PackageVersion={BuildVariables.NETStandardLibrary20PackageVersion}",
             };
 
             if (!suppressRestore)
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -73,7 +73,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         {
             _msBuildPath = @"$(_DesktopMSBuildPath)";
             _microsoftNETCoreApp30PackageVersion = "$(MicrosoftNETCoreApp30PackageVersion)";
-            _netStandardLibrary20PackageVersion = "$(NETStandardLibrary20PackageVersion)";
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props
@@ -13,11 +13,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
-    <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
-
-    <NETStandardImplicitPackageVersion>$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
-
     <!-- Working around an issue in XDT transforms -->
     <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
   </PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ internal static partial class BuildVariables`
`7`	`7`	`{`
`8`	`8`	`private static string _msBuildPath = string.Empty;`
`9`	`9`	`private static string _microsoftNETCoreApp30PackageVersion = string.Empty;`
`10`		`- private static string _netStandardLibrary20PackageVersion = string.Empty;`
`11`	`10`
`12`	`11`	`static partial void InitializeVariables();`
`13`	`12`
`@@ -28,14 +27,5 @@ public static string MicrosoftNETCoreApp30PackageVersion`
`28`	`27`	`return _microsoftNETCoreApp30PackageVersion;`
`29`	`28`	`}`
`30`	`29`	`}`
`31`		`-`
`32`		`- public static string NETStandardLibrary20PackageVersion`
`33`		`- {`
`34`		`- get`
`35`		`- {`
`36`		`- InitializeVariables();`
`37`		`- return _netStandardLibrary20PackageVersion;`
`38`		`- }`
`39`		`- }`
`40`	`30`	`}`
`41`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests`
`73`	`73`	`{`
`74`	`74`	`_msBuildPath = @"$(_DesktopMSBuildPath)";`
`75`	`75`	`_microsoftNETCoreApp30PackageVersion = "$(MicrosoftNETCoreApp30PackageVersion)";`
`76`		`- _netStandardLibrary20PackageVersion = "$(NETStandardLibrary20PackageVersion)";`
`77`	`76`	`}`
`78`	`77`	`}`
`79`	`78`	`}`