зеркало из https://github.com/dotnet/razor.git
Merge branch 'release/3.0' into merge/release/3.0-preview9-to-release/3.0
This commit is contained in:
Doug Bunting
GitHub
Коммит
457718a1fb
|
|
@ -1,72 +1,72 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.0.0-preview9.19423.4">
|
||||
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.0.0-rc1.19423.1">
|
||||
<Uri>https://github.com/aspnet/Extensions</Uri>
|
||||
<Sha>1be91939b2b824107c39496800aa91f67225b013</Sha>
|
||||
<Sha>9fc4627865c4bfe09d554e72b52fbefbbba72aee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.0.0-preview9.19423.4">
|
||||
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.0.0-rc1.19423.1">
|
||||
<Uri>https://github.com/aspnet/Extensions</Uri>
|
||||
<Sha>1be91939b2b824107c39496800aa91f67225b013</Sha>
|
||||
<Sha>9fc4627865c4bfe09d554e72b52fbefbbba72aee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.0.0-preview9.19423.4">
|
||||
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.0.0-rc1.19423.1">
|
||||
<Uri>https://github.com/aspnet/Extensions</Uri>
|
||||
<Sha>1be91939b2b824107c39496800aa91f67225b013</Sha>
|
||||
<Sha>9fc4627865c4bfe09d554e72b52fbefbbba72aee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-preview9.19423.4">
|
||||
<Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-rc1.19423.1">
|
||||
<Uri>https://github.com/aspnet/Extensions</Uri>
|
||||
<Sha>1be91939b2b824107c39496800aa91f67225b013</Sha>
|
||||
<Sha>9fc4627865c4bfe09d554e72b52fbefbbba72aee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="4.6.0-preview9.19421.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
|
||||
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="4.6.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/corefx</Uri>
|
||||
<Sha>8f95b1e7953e3fbff7f101d0ca6830fd9e37fd99</Sha>
|
||||
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Reflection.Metadata" Version="1.7.0-preview9.19421.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
|
||||
<Dependency Name="System.Reflection.Metadata" Version="1.7.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/corefx</Uri>
|
||||
<Sha>8f95b1e7953e3fbff7f101d0ca6830fd9e37fd99</Sha>
|
||||
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Text.Encodings.Web" Version="4.6.0-preview9.19421.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
|
||||
<Dependency Name="System.Text.Encodings.Web" Version="4.6.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/corefx</Uri>
|
||||
<Sha>8f95b1e7953e3fbff7f101d0ca6830fd9e37fd99</Sha>
|
||||
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.0.0-preview9-19423-09" CoherentParentDependency="Microsoft.Extensions.Logging">
|
||||
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.0.0-rc1-19422-14" CoherentParentDependency="Microsoft.Extensions.Logging">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>2be172345a420387413bab7ce9053a52624c4461</Sha>
|
||||
<Sha>24da14999a8c6d711972b72812ec0c0df82be0c9</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0-preview9-19423-09" CoherentParentDependency="Microsoft.Extensions.Logging">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0-rc1-19422-14" CoherentParentDependency="Microsoft.Extensions.Logging">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>2be172345a420387413bab7ce9053a52624c4461</Sha>
|
||||
<Sha>24da14999a8c6d711972b72812ec0c0df82be0c9</Sha>
|
||||
</Dependency>
|
||||
<!--
|
||||
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
|
||||
All Runtime.$rid packages should have the same version.
|
||||
-->
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.0-preview9-19423-09" CoherentParentDependency="Microsoft.Extensions.Logging">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.0-rc1-19422-14" CoherentParentDependency="Microsoft.Extensions.Logging">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>2be172345a420387413bab7ce9053a52624c4461</Sha>
|
||||
<Sha>24da14999a8c6d711972b72812ec0c0df82be0c9</Sha>
|
||||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<!-- Listed as a dependency to workaround https://github.com/dotnet/cli/issues/10528 -->
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview9.19421.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/corefx</Uri>
|
||||
<Sha>8f95b1e7953e3fbff7f101d0ca6830fd9e37fd99</Sha>
|
||||
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.0.0-preview9.19423.4">
|
||||
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.0.0-rc1.19423.1">
|
||||
<Uri>https://github.com/aspnet/Extensions</Uri>
|
||||
<Sha>1be91939b2b824107c39496800aa91f67225b013</Sha>
|
||||
<Sha>9fc4627865c4bfe09d554e72b52fbefbbba72aee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.0.0-preview9.19423.4">
|
||||
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.0.0-rc1.19423.1">
|
||||
<Uri>https://github.com/aspnet/Extensions</Uri>
|
||||
<Sha>1be91939b2b824107c39496800aa91f67225b013</Sha>
|
||||
<Sha>9fc4627865c4bfe09d554e72b52fbefbbba72aee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19421.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>7aa107d818fe87e627154c0331d6de5d47f39a45</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.3.1-beta3-19421-04" CoherentParentDependency="Microsoft.Extensions.Logging">
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.3.1-beta3-19422-05" CoherentParentDependency="Microsoft.Extensions.Logging">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>807f6d9c1f62e66aa907513ccf0fa5b2372748f6</Sha>
|
||||
<Sha>8cf35ae627a2ab41758993875ac987fc3b188f1f</Sha>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
<MajorVersion>3</MajorVersion>
|
||||
<MinorVersion>0</MinorVersion>
|
||||
<PatchVersion>0</PatchVersion>
|
||||
<PreReleaseVersionLabel>preview9</PreReleaseVersionLabel>
|
||||
<PreReleaseVersionLabel>rc1</PreReleaseVersionLabel>
|
||||
</PropertyGroup>
|
||||
<!--
|
||||
Versioning for tooling releases.
|
||||
|
|
@ -52,21 +52,21 @@
|
|||
|
||||
-->
|
||||
<PropertyGroup Label="Automated">
|
||||
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview9.19423.4</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
|
||||
<MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview9.19423.4</MicrosoftAspNetCoreTestingPackageVersion>
|
||||
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview9.19423.4</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
|
||||
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview9-19423-09</MicrosoftExtensionsDependencyModelPackageVersion>
|
||||
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-preview9.19423.4</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
|
||||
<MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview9.19423.4</MicrosoftExtensionsLoggingPackageVersion>
|
||||
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.0.0-preview9.19423.4</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>3.0.0-preview9-19423-09</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.0-preview9-19423-09</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview9.19421.4</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.6.0-preview9.19421.4</SystemDiagnosticsDiagnosticSourcePackageVersion>
|
||||
<SystemTextEncodingsWebPackageVersion>4.6.0-preview9.19421.4</SystemTextEncodingsWebPackageVersion>
|
||||
<SystemReflectionMetadataPackageVersion>1.7.0-preview9.19421.4</SystemReflectionMetadataPackageVersion>
|
||||
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-rc1.19423.1</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
|
||||
<MicrosoftAspNetCoreTestingPackageVersion>3.0.0-rc1.19423.1</MicrosoftAspNetCoreTestingPackageVersion>
|
||||
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-rc1.19423.1</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
|
||||
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-rc1-19422-14</MicrosoftExtensionsDependencyModelPackageVersion>
|
||||
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-rc1.19423.1</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
|
||||
<MicrosoftExtensionsLoggingPackageVersion>3.0.0-rc1.19423.1</MicrosoftExtensionsLoggingPackageVersion>
|
||||
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.0.0-rc1.19423.1</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>3.0.0-rc1-19422-14</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.0-rc1-19422-14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-rc1.19420.10</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.6.0-rc1.19420.10</SystemDiagnosticsDiagnosticSourcePackageVersion>
|
||||
<SystemTextEncodingsWebPackageVersion>4.6.0-rc1.19420.10</SystemTextEncodingsWebPackageVersion>
|
||||
<SystemReflectionMetadataPackageVersion>1.7.0-rc1.19420.10</SystemReflectionMetadataPackageVersion>
|
||||
<!-- Packages from dotnet/roslyn -->
|
||||
<MicrosoftNetCompilersToolsetPackageVersion>3.3.1-beta3-19421-04</MicrosoftNetCompilersToolsetPackageVersion>
|
||||
<MicrosoftNetCompilersToolsetPackageVersion>3.3.1-beta3-19422-05</MicrosoftNetCompilersToolsetPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Label="Dependency version settings">
|
||||
<!--
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"tools": {
|
||||
"dotnet": "3.0.100-preview7-012821",
|
||||
"dotnet": "3.0.100-preview8-013656",
|
||||
"runtimes": {
|
||||
"dotnet": [
|
||||
"2.1.11",
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
}
|
||||
},
|
||||
"sdk": {
|
||||
"version": "3.0.100-preview7-012821"
|
||||
"version": "3.0.100-preview8-013656"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19421.1"
|
||||
|
|
|
|||
|
|
@ -36,6 +36,8 @@
|
|||
<Compile Include="..\Microsoft.AspNetCore.Razor.Tools\Client.cs">
|
||||
<Link>Shared\Client.cs</Link>
|
||||
</Compile>
|
||||
|
||||
<Content Include="_._" CopyToOutputDirectory="PreserveNewest" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="LayoutDependencies" BeforeTargets="Build" Condition="'$(IsInnerBuild)' != 'true'">
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
<file src="Sdk\*" target="Sdk" />
|
||||
<file src="build\**" target="build" />
|
||||
<file src="buildMultiTargeting\**" target="buildMultiTargeting" />
|
||||
<file src="_._" target="lib\netstandard2.0\_._" />
|
||||
|
||||
<file src="$outputPath$\**" target="\" />
|
||||
</files>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче