зеркало из https://github.com/dotnet/razor.git
[master] Update dependencies from dotnet/arcade dotnet/aspnetcore (#3262)
[master] Update dependencies from dotnet/arcade dotnet/aspnetcore - Coherency Updates: - Microsoft.Extensions.Configuration.Json: from 6.0.0-preview.3.21156.6 to 6.0.0-preview.3.21157.6 (parent: Microsoft.CodeAnalysis.Razor) - Microsoft.Extensions.Logging: from 6.0.0-preview.3.21156.6 to 6.0.0-preview.3.21157.6 (parent: Microsoft.CodeAnalysis.Razor) - System.Diagnostics.DiagnosticSource: from 6.0.0-preview.3.21156.6 to 6.0.0-preview.3.21157.6 (parent: Microsoft.CodeAnalysis.Razor) - System.Resources.Extensions: from 6.0.0-preview.3.21156.6 to 6.0.0-preview.3.21157.6 (parent: Microsoft.CodeAnalysis.Razor) - System.Text.Encodings.Web: from 6.0.0-preview.3.21156.6 to 6.0.0-preview.3.21157.6 (parent: Microsoft.CodeAnalysis.Razor) - Microsoft.Extensions.DependencyModel: from 6.0.0-preview.3.21156.6 to 6.0.0-preview.3.21157.6 (parent: Microsoft.CodeAnalysis.Razor) - Microsoft.NETCore.App.Ref: from 6.0.0-preview.3.21156.6 to 6.0.0-preview.3.21157.6 (parent: Microsoft.CodeAnalysis.Razor) - Microsoft.NETCore.BrowserDebugHost.Transport: from 6.0.0-preview.3.21156.6 to 6.0.0-preview.3.21157.6 (parent: Microsoft.CodeAnalysis.Razor) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.3.21156.6 to 6.0.0-preview.3.21157.6 (parent: Microsoft.CodeAnalysis.Razor) - Microsoft.NETCore.Platforms: from 6.0.0-preview.3.21156.6 to 6.0.0-preview.3.21157.6 (parent: Microsoft.CodeAnalysis.Razor) - Update Microsoft.CodeAnalysis.NetAnalyzers
This commit is contained in:
dotnet-maestro[bot]
GitHub
Родитель
c6a95774e3
Коммит
8bfadf4e8d
|
|
@ -1,88 +1,88 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.CodeAnalysis.Razor" Version="6.0.0-preview.3.21157.2">
|
||||
<Dependency Name="Microsoft.CodeAnalysis.Razor" Version="6.0.0-preview.3.21158.4">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>06837edb9dc94d597c1b1bc655dd295259cde3ae</Sha>
|
||||
<Sha>bf51aa5bfc50a1061c83c49c2273f920a2c22116</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.Razor.Internal.Transport" Version="6.0.0-preview.3.21157.2">
|
||||
<Dependency Name="Microsoft.AspNetCore.Razor.Internal.Transport" Version="6.0.0-preview.3.21158.4">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>06837edb9dc94d597c1b1bc655dd295259cde3ae</Sha>
|
||||
<Sha>bf51aa5bfc50a1061c83c49c2273f920a2c22116</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="6.0.0-preview.3.21157.2">
|
||||
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="6.0.0-preview.3.21158.4">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>06837edb9dc94d597c1b1bc655dd295259cde3ae</Sha>
|
||||
<Sha>bf51aa5bfc50a1061c83c49c2273f920a2c22116</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.Testing" Version="6.0.0-preview.3.21157.2">
|
||||
<Dependency Name="Microsoft.AspNetCore.Testing" Version="6.0.0-preview.3.21158.4">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>06837edb9dc94d597c1b1bc655dd295259cde3ae</Sha>
|
||||
<Sha>bf51aa5bfc50a1061c83c49c2273f920a2c22116</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.0-preview.3.21157.2">
|
||||
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.0-preview.3.21158.4">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>06837edb9dc94d597c1b1bc655dd295259cde3ae</Sha>
|
||||
<Sha>bf51aa5bfc50a1061c83c49c2273f920a2c22116</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X" Version="6.0.0-preview.3.21157.2">
|
||||
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X" Version="6.0.0-preview.3.21158.4">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>06837edb9dc94d597c1b1bc655dd295259cde3ae</Sha>
|
||||
<Sha>bf51aa5bfc50a1061c83c49c2273f920a2c22116</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X" Version="6.0.0-preview.3.21157.2">
|
||||
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X" Version="6.0.0-preview.3.21158.4">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>06837edb9dc94d597c1b1bc655dd295259cde3ae</Sha>
|
||||
<Sha>bf51aa5bfc50a1061c83c49c2273f920a2c22116</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="6.0.0-preview.3.21156.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="6.0.0-preview.3.21157.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>49eed0efd03fa09be1718cb67b1a7b38c8cfb95c</Sha>
|
||||
<Sha>acbbb505492244b4c07a4a368257ba86a1fc02e1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-preview.3.21156.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-preview.3.21157.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>49eed0efd03fa09be1718cb67b1a7b38c8cfb95c</Sha>
|
||||
<Sha>acbbb505492244b4c07a4a368257ba86a1fc02e1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk.Razor" Version="6.0.0-alpha.1.21072.5">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>20b6779cf3af2fed6a8fe64a0865cfab50b776bb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0-preview.3.21156.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0-preview.3.21157.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>49eed0efd03fa09be1718cb67b1a7b38c8cfb95c</Sha>
|
||||
<Sha>acbbb505492244b4c07a4a368257ba86a1fc02e1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.3.21156.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.3.21157.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>49eed0efd03fa09be1718cb67b1a7b38c8cfb95c</Sha>
|
||||
<Sha>acbbb505492244b4c07a4a368257ba86a1fc02e1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Text.Encodings.Web" Version="6.0.0-preview.3.21156.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="System.Text.Encodings.Web" Version="6.0.0-preview.3.21157.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>49eed0efd03fa09be1718cb67b1a7b38c8cfb95c</Sha>
|
||||
<Sha>acbbb505492244b4c07a4a368257ba86a1fc02e1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.3.21156.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.3.21157.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>49eed0efd03fa09be1718cb67b1a7b38c8cfb95c</Sha>
|
||||
<Sha>acbbb505492244b4c07a4a368257ba86a1fc02e1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.3.21156.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.3.21157.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>49eed0efd03fa09be1718cb67b1a7b38c8cfb95c</Sha>
|
||||
<Sha>acbbb505492244b4c07a4a368257ba86a1fc02e1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-preview.3.21156.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-preview.3.21157.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>49eed0efd03fa09be1718cb67b1a7b38c8cfb95c</Sha>
|
||||
<Sha>acbbb505492244b4c07a4a368257ba86a1fc02e1</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="6.0.0-preview.3.21156.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21157.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>49eed0efd03fa09be1718cb67b1a7b38c8cfb95c</Sha>
|
||||
<Sha>acbbb505492244b4c07a4a368257ba86a1fc02e1</Sha>
|
||||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<!-- Listed as a dependency to workaround https://github.com/dotnet/cli/issues/10528 -->
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.3.21156.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.3.21157.6" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>49eed0efd03fa09be1718cb67b1a7b38c8cfb95c</Sha>
|
||||
<Sha>acbbb505492244b4c07a4a368257ba86a1fc02e1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21125.5">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21152.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
|
||||
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
|||
|
|
@ -48,24 +48,24 @@
|
|||
|
||||
-->
|
||||
<PropertyGroup Label="Automated">
|
||||
<MicrosoftCodeAnalysisRazorPackageVersion>6.0.0-preview.3.21157.2</MicrosoftCodeAnalysisRazorPackageVersion>
|
||||
<MicrosoftAspNetCoreRazorInternalTransportPackageVersion>6.0.0-preview.3.21157.2</MicrosoftAspNetCoreRazorInternalTransportPackageVersion>
|
||||
<MicrosoftAspNetCoreRazorLanguagePackageVersion>6.0.0-preview.3.21157.2</MicrosoftAspNetCoreRazorLanguagePackageVersion>
|
||||
<MicrosoftAspNetCoreTestingPackageVersion>6.0.0-preview.3.21157.2</MicrosoftAspNetCoreTestingPackageVersion>
|
||||
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>6.0.0-preview.3.21157.2</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
|
||||
<MicrosoftAspNetCoreMvcRazorExtensionsVersion1_XPackageVersion>6.0.0-preview.3.21157.2</MicrosoftAspNetCoreMvcRazorExtensionsVersion1_XPackageVersion>
|
||||
<MicrosoftAspNetCoreMvcRazorExtensionsVersion2_XPackageVersion>6.0.0-preview.3.21157.2</MicrosoftAspNetCoreMvcRazorExtensionsVersion2_XPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationJsonPackageVersion>6.0.0-preview.3.21156.6</MicrosoftExtensionsConfigurationJsonPackageVersion>
|
||||
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-preview.3.21156.6</MicrosoftExtensionsDependencyModelPackageVersion>
|
||||
<MicrosoftExtensionsLoggingPackageVersion>6.0.0-preview.3.21156.6</MicrosoftExtensionsLoggingPackageVersion>
|
||||
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>6.0.0-preview.3.21156.6</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.3.21156.6</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.3.21156.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>6.0.0-preview.3.21156.6</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftCodeAnalysisRazorPackageVersion>6.0.0-preview.3.21158.4</MicrosoftCodeAnalysisRazorPackageVersion>
|
||||
<MicrosoftAspNetCoreRazorInternalTransportPackageVersion>6.0.0-preview.3.21158.4</MicrosoftAspNetCoreRazorInternalTransportPackageVersion>
|
||||
<MicrosoftAspNetCoreRazorLanguagePackageVersion>6.0.0-preview.3.21158.4</MicrosoftAspNetCoreRazorLanguagePackageVersion>
|
||||
<MicrosoftAspNetCoreTestingPackageVersion>6.0.0-preview.3.21158.4</MicrosoftAspNetCoreTestingPackageVersion>
|
||||
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>6.0.0-preview.3.21158.4</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
|
||||
<MicrosoftAspNetCoreMvcRazorExtensionsVersion1_XPackageVersion>6.0.0-preview.3.21158.4</MicrosoftAspNetCoreMvcRazorExtensionsVersion1_XPackageVersion>
|
||||
<MicrosoftAspNetCoreMvcRazorExtensionsVersion2_XPackageVersion>6.0.0-preview.3.21158.4</MicrosoftAspNetCoreMvcRazorExtensionsVersion2_XPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationJsonPackageVersion>6.0.0-preview.3.21157.6</MicrosoftExtensionsConfigurationJsonPackageVersion>
|
||||
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-preview.3.21157.6</MicrosoftExtensionsDependencyModelPackageVersion>
|
||||
<MicrosoftExtensionsLoggingPackageVersion>6.0.0-preview.3.21157.6</MicrosoftExtensionsLoggingPackageVersion>
|
||||
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>6.0.0-preview.3.21157.6</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.3.21157.6</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.3.21157.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>6.0.0-preview.3.21157.6</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftNETSdkRazorPackageVersion>6.0.0-alpha.1.21072.5</MicrosoftNETSdkRazorPackageVersion>
|
||||
<SystemDiagnosticsDiagnosticSourcePackageVersion>6.0.0-preview.3.21156.6</SystemDiagnosticsDiagnosticSourcePackageVersion>
|
||||
<SystemResourcesExtensionsPackageVersion>6.0.0-preview.3.21156.6</SystemResourcesExtensionsPackageVersion>
|
||||
<SystemTextEncodingsWebPackageVersion>6.0.0-preview.3.21156.6</SystemTextEncodingsWebPackageVersion>
|
||||
<SystemDiagnosticsDiagnosticSourcePackageVersion>6.0.0-preview.3.21157.6</SystemDiagnosticsDiagnosticSourcePackageVersion>
|
||||
<SystemResourcesExtensionsPackageVersion>6.0.0-preview.3.21157.6</SystemResourcesExtensionsPackageVersion>
|
||||
<SystemTextEncodingsWebPackageVersion>6.0.0-preview.3.21157.6</SystemTextEncodingsWebPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Label="Dependency version settings">
|
||||
<!--
|
||||
|
|
@ -147,7 +147,7 @@
|
|||
<VS_NewtonsoftJsonPackageVersion>12.0.2</VS_NewtonsoftJsonPackageVersion>
|
||||
<VSMAC_NewtonsoftJsonPackageVersion>12.0.2</VSMAC_NewtonsoftJsonPackageVersion>
|
||||
<Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion>3.3.2</Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion>
|
||||
<Tooling_MicrosoftCodeAnalysisNetAnalyzersPackageVersion>5.0.3</Tooling_MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
|
||||
<Tooling_MicrosoftCodeAnalysisNetAnalyzersPackageVersion>6.0.0-preview3.21158.1</Tooling_MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
|
||||
<Tooling_MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>3.10.0-2.21121.14</Tooling_MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
|
||||
<Tooling_MicrosoftCodeAnalysisPackageVersion>3.10.0-2.21121.14</Tooling_MicrosoftCodeAnalysisPackageVersion>
|
||||
<Tooling_MicrosoftCodeAnalysisCommonPackageVersion>3.10.0-2.21121.14</Tooling_MicrosoftCodeAnalysisCommonPackageVersion>
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ fetch_tizen_pkgs()
|
|||
Inform "Initialize arm base"
|
||||
fetch_tizen_pkgs_init standard base
|
||||
Inform "fetch common packages"
|
||||
fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel
|
||||
fetch_tizen_pkgs armv7l gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
|
||||
Inform "fetch coreclr packages"
|
||||
fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
|
||||
Inform "fetch corefx packages"
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ parameters:
|
|||
WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
|
||||
CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload
|
||||
IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion
|
||||
DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json
|
||||
DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json
|
||||
DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases.json
|
||||
DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases.json
|
||||
EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control
|
||||
WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget."
|
||||
Creator: '' # optional -- if the build is external, use this to specify who is sending the job
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ parameters:
|
|||
XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner
|
||||
XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects
|
||||
IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion
|
||||
DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases-index.json
|
||||
DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases-index.json
|
||||
DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
|
||||
DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
|
||||
EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control
|
||||
WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget."
|
||||
IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
|
|||
|
||||
# Use dotnet installation specified in DOTNET_INSTALL_DIR if it contains the required SDK version,
|
||||
# otherwise install the dotnet CLI and SDK to repo local .dotnet directory to avoid potential permission issues.
|
||||
if ((-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -ne $null) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) {
|
||||
if ((-not $globalJsonHasRuntimes) -and (-not [string]::IsNullOrEmpty($env:DOTNET_INSTALL_DIR)) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) {
|
||||
$dotnetRoot = $env:DOTNET_INSTALL_DIR
|
||||
} else {
|
||||
$dotnetRoot = Join-Path $RepoRoot '.dotnet'
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"tools": {
|
||||
"dotnet": "5.0.100",
|
||||
"dotnet": "6.0.100-preview.1.21103.13",
|
||||
"runtimes": {
|
||||
"dotnet": [
|
||||
"2.1.11",
|
||||
|
|
@ -15,10 +15,10 @@
|
|||
}
|
||||
},
|
||||
"sdk": {
|
||||
"version": "5.0.100"
|
||||
"version": "6.0.100-preview.1.21103.13"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21125.5",
|
||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21152.1",
|
||||
"Yarn.MSBuild": "1.22.5"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче