зеркало из https://github.com/dotnet/razor.git
Update dependencies and remove some unused version variable overrides (#238)
* Update dependencies * Add workaround for dotnet/sdk#2976 * Remove unused NETStandard package version variable and overrides * Update xunit to 2.4.1
This commit is contained in:
Nate McMaster
GitHub
Родитель
fc8f1b0924
Коммит
67082970b7
|
|
@ -1,9 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<ImportNetSdkFromRepoToolset>false</ImportNetSdkFromRepoToolset>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
We don't follow their conventions for project naming.
|
||||
-->
|
||||
|
|
|
|||
|
|
@ -2,4 +2,14 @@
|
|||
<Project>
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
|
||||
<Import Project="eng\MPack.targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<!-- Workaround https://github.com/dotnet/sdk/issues/2976 -->
|
||||
<PackageReference Update="Microsoft.NETCore.Platforms" PrivateAssets="All" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Workaround https://github.com/dotnet/cli/issues/10528 -->
|
||||
<PropertyGroup>
|
||||
<BundledNETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</BundledNETCorePlatformsPackageVersion>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -1,43 +1,48 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.0.0-preview.19078.2">
|
||||
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.0.0-preview3.19120.3">
|
||||
<Uri>https://github.com/aspnet/Extensions</Uri>
|
||||
<Sha>a58a80bdf5ad971167f73e501661131c3e34a901</Sha>
|
||||
<Sha>924015e98bc443023a6b0eea2c0016b876e4051f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.0.0-preview.19078.2">
|
||||
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.0.0-preview3.19120.3">
|
||||
<Uri>https://github.com/aspnet/Extensions</Uri>
|
||||
<Sha>a58a80bdf5ad971167f73e501661131c3e34a901</Sha>
|
||||
<Sha>924015e98bc443023a6b0eea2c0016b876e4051f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.0.0-preview.19078.2">
|
||||
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.0.0-preview3.19120.3">
|
||||
<Uri>https://github.com/aspnet/Extensions</Uri>
|
||||
<Sha>a58a80bdf5ad971167f73e501661131c3e34a901</Sha>
|
||||
<Sha>924015e98bc443023a6b0eea2c0016b876e4051f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="4.6.0-preview.19109.6">
|
||||
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="4.6.0-preview3.19115.9">
|
||||
<Uri>https://github.com/dotnet/corefx</Uri>
|
||||
<Sha>0abec4390b30fdda97dc496594f9b1f9c9b20e17</Sha>
|
||||
<Sha>b07bc5efcad439d5157f65df176e08f26ccb4b88</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Text.Encodings.Web" Version="4.6.0-preview.19109.6">
|
||||
<Dependency Name="System.Text.Encodings.Web" Version="4.6.0-preview3.19115.9">
|
||||
<Uri>https://github.com/dotnet/corefx</Uri>
|
||||
<Sha>0abec4390b30fdda97dc496594f9b1f9c9b20e17</Sha>
|
||||
<Sha>b07bc5efcad439d5157f65df176e08f26ccb4b88</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.0.0-preview3-27415-4">
|
||||
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.0.0-preview3-27419-3">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>0dfcccec1a9fdf391fe4544ed354ac15390d9205</Sha>
|
||||
<Sha>84174943d9ea6cf34ade0dbab8e7f0319378f0ab</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview3-27415-4">
|
||||
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview3-27419-3">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>0dfcccec1a9fdf391fe4544ed354ac15390d9205</Sha>
|
||||
<Sha>84174943d9ea6cf34ade0dbab8e7f0319378f0ab</Sha>
|
||||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.0.0-preview.19078.2">
|
||||
<Uri>https://github.com/aspnet/Extensions</Uri>
|
||||
<Sha>a58a80bdf5ad971167f73e501661131c3e34a901</Sha>
|
||||
<!-- Listed as a dependency to workaround https://github.com/dotnet/cli/issues/10528 -->
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview3.19115.9">
|
||||
<Uri>https://github.com/dotnet/corefx</Uri>
|
||||
<Sha>b07bc5efcad439d5157f65df176e08f26ccb4b88</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.0.0-preview.19078.2">
|
||||
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.0.0-preview3.19120.3">
|
||||
<Uri>https://github.com/aspnet/Extensions</Uri>
|
||||
<Sha>a58a80bdf5ad971167f73e501661131c3e34a901</Sha>
|
||||
<Sha>924015e98bc443023a6b0eea2c0016b876e4051f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.0.0-preview3.19120.3">
|
||||
<Uri>https://github.com/aspnet/Extensions</Uri>
|
||||
<Sha>924015e98bc443023a6b0eea2c0016b876e4051f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19119.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
|
||||
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<!-- Opt-in arcade features -->
|
||||
<PropertyGroup>
|
||||
|
|
@ -55,15 +55,16 @@
|
|||
|
||||
-->
|
||||
<PropertyGroup Label="Automated">
|
||||
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview.19078.2</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
|
||||
<MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview.19078.2</MicrosoftAspNetCoreTestingPackageVersion>
|
||||
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview.19078.2</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
|
||||
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview3-27415-4</MicrosoftExtensionsDependencyModelPackageVersion>
|
||||
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-preview.19078.2</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
|
||||
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.0.0-preview.19078.2</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
|
||||
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview3-27415-4</MicrosoftNETCoreAppPackageVersion>
|
||||
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.6.0-preview.19109.6</SystemDiagnosticsDiagnosticSourcePackageVersion>
|
||||
<SystemTextEncodingsWebPackageVersion>4.6.0-preview.19109.6</SystemTextEncodingsWebPackageVersion>
|
||||
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview3.19120.3</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
|
||||
<MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview3.19120.3</MicrosoftAspNetCoreTestingPackageVersion>
|
||||
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview3.19120.3</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
|
||||
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview3-27419-3</MicrosoftExtensionsDependencyModelPackageVersion>
|
||||
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-preview3.19120.3</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
|
||||
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.0.0-preview3.19120.3</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
|
||||
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview3-27419-3</MicrosoftNETCoreAppPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview3.19115.9</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.6.0-preview3.19115.9</SystemDiagnosticsDiagnosticSourcePackageVersion>
|
||||
<SystemTextEncodingsWebPackageVersion>4.6.0-preview3.19115.9</SystemTextEncodingsWebPackageVersion>
|
||||
</PropertyGroup>
|
||||
<!--
|
||||
|
||||
|
|
@ -109,7 +110,6 @@
|
|||
<MonoAddinsPackageVersion>1.3.8</MonoAddinsPackageVersion>
|
||||
<MonoDevelopSdkPackageVersion>1.0.1</MonoDevelopSdkPackageVersion>
|
||||
<MoqPackageVersion>4.10.0</MoqPackageVersion>
|
||||
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
|
||||
<!-- STOP!!! We need to reference the version of JSON that our HOSTS supprt. -->
|
||||
<NewtonsoftJsonPackageVersion>9.0.1</NewtonsoftJsonPackageVersion>
|
||||
<VS_NewtonsoftJsonPackageVersion>9.0.1</VS_NewtonsoftJsonPackageVersion>
|
||||
|
|
@ -128,8 +128,7 @@
|
|||
<VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion>3.0.0-beta2-18612-05</VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion>
|
||||
<VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion>3.0.0-beta2-18612-05</VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion>
|
||||
<XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion>
|
||||
<XunitPackageVersion>2.3.1</XunitPackageVersion>
|
||||
<XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
|
||||
<XunitVersion>2.4.1</XunitVersion>
|
||||
</PropertyGroup>
|
||||
<!--
|
||||
These items will be used to install additional dotnet runtimes during bootstrapping. See tools.props.
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
|
|||
{
|
||||
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 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
|
|||
return _microsoftNETCoreApp30PackageVersion;
|
||||
}
|
||||
}
|
||||
|
||||
public static string NETStandardLibrary20PackageVersion
|
||||
{
|
||||
get
|
||||
{
|
||||
InitializeVariables();
|
||||
return _netStandardLibrary20PackageVersion;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,7 +74,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
|
|||
"/p:RunningAsTest=true",
|
||||
|
||||
$"/p:MicrosoftNETCoreApp30PackageVersion={BuildVariables.MicrosoftNETCoreApp30PackageVersion}",
|
||||
$"/p:NETStandardLibrary20PackageVersion={BuildVariables.NETStandardLibrary20PackageVersion}",
|
||||
};
|
||||
|
||||
if (!suppressRestore)
|
||||
|
|
|
|||
|
|
@ -73,7 +73,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
|
|||
{
|
||||
_msBuildPath = @"$(_DesktopMSBuildPath)";
|
||||
_microsoftNETCoreApp30PackageVersion = "$(MicrosoftNETCoreApp30PackageVersion)";
|
||||
_netStandardLibrary20PackageVersion = "$(NETStandardLibrary20PackageVersion)";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче