dotnet
/
aspnetcore-tooling
зеркало из https://github.com/dotnet/razor.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'release/3.0' => 'release/3.1' (#1046)

This commit is contained in:
Doug Bunting 2019-08-31 18:11:18 -07:00 коммит произвёл GitHub
Родитель e799c531b2 04b15baf7a
Коммит 9489c53ace
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 47 добавлений и 32 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
Directory.Build.props
Просмотреть файл

@ -14,7 +14,7 @@
<Import
Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
<PropertyGroup Label="Build Settings">
<LangVersion>8.0</LangVersion>
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
@ -24,6 +24,9 @@
<GenerateResxSource>true</GenerateResxSource>
<GenerateResxSourceEmitFormatMethods>true</GenerateResxSourceEmitFormatMethods>
<ExcludeFromSourceBuild Condition="'$(IsUnitTestProject)' == 'true'">true</ExcludeFromSourceBuild>
<!-- Embed source files that are not tracked by the source control manager in the PDB. -->
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>
<PropertyGroup Label="Package and Assembly Metadata">

40
eng/Version.Details.xml
Просмотреть файл

@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.0.0-rc1.19429.5">
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.0.0-rc1.19430.1">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>9b9a6d47dba7a965a94fd38e67a298cfc6d2b813</Sha>
<Sha>12c63278e279db96782519e087ccc57cde42542c</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.0.0-rc1.19429.5">
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.0.0-rc1.19430.1">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>9b9a6d47dba7a965a94fd38e67a298cfc6d2b813</Sha>
<Sha>12c63278e279db96782519e087ccc57cde42542c</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.0.0-rc1.19429.5">
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.0.0-rc1.19430.1">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>9b9a6d47dba7a965a94fd38e67a298cfc6d2b813</Sha>
<Sha>12c63278e279db96782519e087ccc57cde42542c</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-rc1.19429.5">
<Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-rc1.19430.1">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>9b9a6d47dba7a965a94fd38e67a298cfc6d2b813</Sha>
<Sha>12c63278e279db96782519e087ccc57cde42542c</Sha>
</Dependency>
<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>
@ -29,21 +29,21 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.0.0-rc1-19428-14" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.0.0-rc1-19429-07" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>0175edb2b0d0c5f541560f4056bb7633d1445688</Sha>
<Sha>36fa439f918f8f0e979e78834b979deb33b9b97a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0-rc1-19428-14" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0-rc1-19429-07" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>0175edb2b0d0c5f541560f4056bb7633d1445688</Sha>
<Sha>36fa439f918f8f0e979e78834b979deb33b9b97a</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-rc1-19428-14" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.0-rc1-19429-07" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>0175edb2b0d0c5f541560f4056bb7633d1445688</Sha>
<Sha>36fa439f918f8f0e979e78834b979deb33b9b97a</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
@ -52,21 +52,21 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.0.0-rc1.19429.5">
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.0.0-rc1.19430.1">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>9b9a6d47dba7a965a94fd38e67a298cfc6d2b813</Sha>
<Sha>12c63278e279db96782519e087ccc57cde42542c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.0.0-rc1.19429.5">
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.0.0-rc1.19430.1">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>9b9a6d47dba7a965a94fd38e67a298cfc6d2b813</Sha>
<Sha>12c63278e279db96782519e087ccc57cde42542c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19425.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2de3acc671fc624191672a45564f9ef130af5cd4</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.3.1-beta3-19429-03" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.3.1-beta3-19430-03" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>4d9190ea3daac1ccf7a92aa4e0a169ab29ca8f9f</Sha>
<Sha>fa8e2c9b566e4471a3509fc63d7baca0a2a6d30b</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

20
eng/Versions.props
Просмотреть файл

@ -52,21 +52,21 @@
-->
<PropertyGroup Label="Automated">
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-rc1.19429.5</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>3.0.0-rc1.19429.5</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-rc1.19429.5</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-rc1-19428-14</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-rc1.19429.5</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>3.0.0-rc1.19429.5</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.0.0-rc1.19429.5</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.0.0-rc1-19428-14</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.0-rc1-19428-14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-rc1.19430.1</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>3.0.0-rc1.19430.1</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-rc1.19430.1</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-rc1-19429-07</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-rc1.19430.1</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>3.0.0-rc1.19430.1</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.0.0-rc1.19430.1</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.0.0-rc1-19429-07</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.0-rc1-19429-07</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-19429-03</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>3.3.1-beta3-19430-03</MicrosoftNetCompilersToolsetPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Dependency version settings">
<!--

14
src/Razor/src/RazorDeveloperTools/RazorDeveloperTools.csproj
Просмотреть файл

@ -100,10 +100,22 @@
<PackageReference Include="Microsoft.VisualStudio.SDK.Analyzers" Version="$(MicrosoftVisualStudioSDKAnalyzersVersion)" PrivateAssets="all" />
</ItemGroup>
<Target Name="_RemoveAnalyzers" BeforeTargets="CoreCompile">
<Target Name="_RemoveAnalyzers_CopyXaml" BeforeTargets="CoreCompile">
<ItemGroup>
<Analyzer Remove="@(Analyzer)" />
<_SourcesForXamlCopy Include="*\*.xaml" />
</ItemGroup>
<!-- Make XAML files available to the compiler. This allows embedding the files for source link. -->
<Copy
SourceFiles="@(_SourcesForXamlCopy)"
DestinationFiles="@(_SourcesForXamlCopy -> '$(IntermediateOutputPath)%(RelativeDir)%(RelativeDir)%(Filename)%(Extension)')"
SkipUnchangedFiles="$(SkipCopyUnchangedFiles)"
OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
Retries="$(CopyRetryCount)"
RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)"
UseSymboliclinksIfPossible="$(CreateSymbolicLinksForCopyFilesToOutputDirectoryIfPossible)" />
</Target>
<Target Name="WORKAROUND_SETINFORMATIONVERSION" BeforeTargets="AddSourceRevisionToInformationalVersion">