зеркало из https://github.com/dotnet/msbuild.git
Manual update dependencies from dotnet/arcade (#10577)
This commit is contained in:
Родитель
a03ee4ba9c
Коммит
b82694a16d
|
@ -425,3 +425,12 @@ dotnet_diagnostic.IDE0073.severity = error
|
||||||
|
|
||||||
# Use 'System.Threading.Lock'
|
# Use 'System.Threading.Lock'
|
||||||
dotnet_diagnostic.IDE0330.severity = suggestion
|
dotnet_diagnostic.IDE0330.severity = suggestion
|
||||||
|
|
||||||
|
|
||||||
|
# xunit to supress temp
|
||||||
|
dotnet_diagnostic.xUnit2020.severity = none
|
||||||
|
dotnet_diagnostic.xUnit1031.severity = none
|
||||||
|
dotnet_diagnostic.xUnit1012.severity = none
|
||||||
|
dotnet_diagnostic.xUnit2029.severity = none
|
||||||
|
# Do not use equality check to check for collection size.
|
||||||
|
dotnet_diagnostic.xUnit2013.severity = none
|
|
@ -1103,6 +1103,3 @@ dotnet_diagnostic.SA1643.severity = suggestion
|
||||||
dotnet_diagnostic.SA1649.severity = suggestion
|
dotnet_diagnostic.SA1649.severity = suggestion
|
||||||
|
|
||||||
dotnet_diagnostic.SA1652.severity = none
|
dotnet_diagnostic.SA1652.severity = none
|
||||||
|
|
||||||
# Do not use equality check to check for collection size.
|
|
||||||
dotnet_diagnostic.xUnit2013.severity = none
|
|
|
@ -71,14 +71,14 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24423.2">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24426.3">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
|
<Sha>e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<!-- Intermediate is necessary for source build. -->
|
<!-- Intermediate is necessary for source build. -->
|
||||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24423.2">
|
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24426.3">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
|
<Sha>e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
|
@ -104,9 +104,9 @@
|
||||||
<Sha>13b65d3b5638457d94c83b545235f47f0d11e483</Sha>
|
<Sha>13b65d3b5638457d94c83b545235f47f0d11e483</Sha>
|
||||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24421.4">
|
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24426.3">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>4460b755f3c7c89e9660d9580ff79afc4218dd85</Sha>
|
<Sha>e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ToolsetDependencies>
|
</ToolsetDependencies>
|
||||||
</Dependencies>
|
</Dependencies>
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
Otherwise, this version of dotnet will not be installed and the build will error out. -->
|
Otherwise, this version of dotnet will not be installed and the build will error out. -->
|
||||||
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
|
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
|
||||||
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
|
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
|
||||||
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24421.4</MicrosoftDotNetXUnitExtensionsVersion>
|
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24426.3</MicrosoftDotNetXUnitExtensionsVersion>
|
||||||
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
|
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
|
||||||
<MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
|
<MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
|
||||||
<MicrosoftNetCompilersToolsetVersion>4.12.0-2.24425.4</MicrosoftNetCompilersToolsetVersion>
|
<MicrosoftNetCompilersToolsetVersion>4.12.0-2.24425.4</MicrosoftNetCompilersToolsetVersion>
|
||||||
|
@ -75,13 +75,4 @@
|
||||||
<FileVersion>$(VersionPrefix).$(FileVersion.Split('.')[3])</FileVersion>
|
<FileVersion>$(VersionPrefix).$(FileVersion.Split('.')[3])</FileVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Target>
|
</Target>
|
||||||
<!-- Freeze the version for the current upgrade of the sdk.
|
|
||||||
TODO:Delete the lines below once the Retargeting merged.
|
|
||||||
-->
|
|
||||||
<PropertyGroup>
|
|
||||||
<XUnitVersion>2.4.2</XUnitVersion>
|
|
||||||
<XUnitAnalyzersVersion>1.1.0</XUnitAnalyzersVersion>
|
|
||||||
<XUnitRunnerConsoleVersion>$(XUnitVersion)</XUnitRunnerConsoleVersion>
|
|
||||||
<XUnitRunnerVisualStudioVersion>2.4.3</XUnitRunnerVisualStudioVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {
|
||||||
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
|
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
|
||||||
}
|
}
|
||||||
|
|
||||||
$dotnetVersions = @('5','6','7','8')
|
$dotnetVersions = @('5','6','7','8','9')
|
||||||
|
|
||||||
foreach ($dotnetVersion in $dotnetVersions) {
|
foreach ($dotnetVersion in $dotnetVersions) {
|
||||||
$feedPrefix = "dotnet" + $dotnetVersion;
|
$feedPrefix = "dotnet" + $dotnetVersion;
|
||||||
|
|
|
@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then
|
||||||
PackageSources+=('dotnet3.1-internal-transport')
|
PackageSources+=('dotnet3.1-internal-transport')
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DotNetVersions=('5' '6' '7' '8')
|
DotNetVersions=('5' '6' '7' '8' '9')
|
||||||
|
|
||||||
for DotNetVersion in ${DotNetVersions[@]} ; do
|
for DotNetVersion in ${DotNetVersions[@]} ; do
|
||||||
FeedPrefix="dotnet${DotNetVersion}";
|
FeedPrefix="dotnet${DotNetVersion}";
|
||||||
|
|
|
@ -33,11 +33,6 @@ parameters:
|
||||||
artifactPublishSteps: []
|
artifactPublishSteps: []
|
||||||
runAsPublic: false
|
runAsPublic: false
|
||||||
|
|
||||||
# Sbom related params
|
|
||||||
enableSbom: true
|
|
||||||
PackageVersion: 9.0.0
|
|
||||||
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
|
|
||||||
|
|
||||||
# 1es specific parameters
|
# 1es specific parameters
|
||||||
is1ESPipeline: ''
|
is1ESPipeline: ''
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
param (
|
param (
|
||||||
$darcVersion = $null,
|
$darcVersion = $null,
|
||||||
$versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16',
|
$versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2020-02-20',
|
||||||
$verbosity = 'minimal',
|
$verbosity = 'minimal',
|
||||||
$toolpath = $null
|
$toolpath = $null
|
||||||
)
|
)
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
source="${BASH_SOURCE[0]}"
|
source="${BASH_SOURCE[0]}"
|
||||||
darcVersion=''
|
darcVersion=''
|
||||||
versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16'
|
versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2020-02-20'
|
||||||
verbosity='minimal'
|
verbosity='minimal'
|
||||||
|
|
||||||
while [[ $# > 0 ]]; do
|
while [[ $# > 0 ]]; do
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net472</TargetFramework>
|
<TargetFramework>net472</TargetFramework>
|
||||||
<AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
|
<AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
|
||||||
|
<BuildWithNetFrameworkHostedCompiler>false</BuildWithNetFrameworkHostedCompiler>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->
|
<!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->
|
||||||
|
|
|
@ -1,8 +1,22 @@
|
||||||
|
parameters:
|
||||||
|
# Sbom related params
|
||||||
|
enableSbom: true
|
||||||
|
PackageVersion: 9.0.0
|
||||||
|
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- template: /eng/common/core-templates/job/job.yml
|
- template: /eng/common/core-templates/job/job.yml
|
||||||
parameters:
|
parameters:
|
||||||
is1ESPipeline: true
|
is1ESPipeline: true
|
||||||
|
|
||||||
|
componentGovernanceSteps:
|
||||||
|
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
|
||||||
|
- template: /eng/common/templates/steps/generate-sbom.yml
|
||||||
|
parameters:
|
||||||
|
PackageVersion: ${{ parameters.packageVersion }}
|
||||||
|
BuildDropPath: ${{ parameters.buildDropPath }}
|
||||||
|
publishArtifacts: false
|
||||||
|
|
||||||
# publish artifacts
|
# publish artifacts
|
||||||
# for 1ES managed templates, use the templateContext.output to handle multiple outputs.
|
# for 1ES managed templates, use the templateContext.output to handle multiple outputs.
|
||||||
templateContext:
|
templateContext:
|
||||||
|
|
|
@ -32,14 +32,6 @@ jobs:
|
||||||
disableComponentGovernance: ${{ parameters.disableComponentGovernance }}
|
disableComponentGovernance: ${{ parameters.disableComponentGovernance }}
|
||||||
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
|
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
|
||||||
|
|
||||||
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
|
|
||||||
- template: /eng/common/templates/steps/generate-sbom.yml
|
|
||||||
parameters:
|
|
||||||
PackageVersion: ${{ parameters.packageVersion }}
|
|
||||||
BuildDropPath: ${{ parameters.buildDropPath }}
|
|
||||||
publishArtifacts: false
|
|
||||||
|
|
||||||
|
|
||||||
artifactPublishSteps:
|
artifactPublishSteps:
|
||||||
- ${{ if ne(parameters.artifacts.publish, '') }}:
|
- ${{ if ne(parameters.artifacts.publish, '') }}:
|
||||||
- ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}:
|
- ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}:
|
||||||
|
|
|
@ -10,6 +10,6 @@
|
||||||
"xcopy-msbuild": "17.8.5"
|
"xcopy-msbuild": "17.8.5"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24423.2"
|
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24426.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1513,11 +1513,13 @@ namespace Microsoft.Build.UnitTests.BackEnd
|
||||||
_buildManager.EndBuild();
|
_buildManager.EndBuild();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously: needs to be async for xunit's timeout system
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// A canceled build
|
/// A canceled build
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Fact(Timeout = 20_000)]
|
[Fact(Timeout = 20_000)]
|
||||||
public void CancelledBuild()
|
public async System.Threading.Tasks.Task CancelledBuild()
|
||||||
|
#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
|
||||||
{
|
{
|
||||||
Console.WriteLine("Starting CancelledBuild test that is known to hang.");
|
Console.WriteLine("Starting CancelledBuild test that is known to hang.");
|
||||||
string contents = CleanupFileContents(@"
|
string contents = CleanupFileContents(@"
|
||||||
|
|
|
@ -4400,7 +4400,7 @@ namespace Microsoft.Build.UnitTests.Evaluation
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Fact]
|
[Fact]
|
||||||
[ActiveIssue("https://github.com/dotnet/msbuild/issues/7623")]
|
[ActiveIssue("https://github.com/dotnet/msbuild/issues/7623")]
|
||||||
public async void VerifyDTDProcessingIsDisabled2()
|
public async Task VerifyDTDProcessingIsDisabled2()
|
||||||
{
|
{
|
||||||
string projectContents = ObjectModelHelpers.CleanupFileContents(@"<?xml version=""1.0"" encoding=""utf-8""?>
|
string projectContents = ObjectModelHelpers.CleanupFileContents(@"<?xml version=""1.0"" encoding=""utf-8""?>
|
||||||
<!DOCTYPE Project [
|
<!DOCTYPE Project [
|
||||||
|
|
Загрузка…
Ссылка в новой задаче