Skip to content

Commit

Permalink
Manual update dependencies from dotnet/arcade (#10577)
Browse files Browse the repository at this point in the history
  • Loading branch information
f-alizada authored Aug 28, 2024
1 parent a03ee4b commit b82694a
Show file tree
Hide file tree
Showing 15 changed files with 86 additions and 85 deletions.
11 changes: 10 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -424,4 +424,13 @@ dotnet_diagnostic.IDE0100.severity = suggestion
dotnet_diagnostic.IDE0073.severity = error

# 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
5 changes: 1 addition & 4 deletions eng/Common.globalconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,4 @@ dotnet_diagnostic.SA1643.severity = suggestion
# File name should match first type name
dotnet_diagnostic.SA1649.severity = suggestion

dotnet_diagnostic.SA1652.severity = none

# Do not use equality check to check for collection size.
dotnet_diagnostic.xUnit2013.severity = none
dotnet_diagnostic.SA1652.severity = none
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,14 @@
</Dependency>
</ProductDependencies>
<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>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
<Sha>e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4</Sha>
</Dependency>
<!-- 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>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
<Sha>e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
Expand All @@ -104,9 +104,9 @@
<Sha>13b65d3b5638457d94c83b545235f47f0d11e483</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</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>
<Sha>4460b755f3c7c89e9660d9580ff79afc4218dd85</Sha>
<Sha>e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
11 changes: 1 addition & 10 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
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>
<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>
<MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
<MicrosoftNetCompilersToolsetVersion>4.12.0-2.24425.4</MicrosoftNetCompilersToolsetVersion>
Expand All @@ -75,13 +75,4 @@
<FileVersion>$(VersionPrefix).$(FileVersion.Split('.')[3])</FileVersion>
</PropertyGroup>
</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>
2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.ps1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions eng/common/core-templates/job/job.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion eng/common/darc-init.ps1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion eng/common/darc-init.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions eng/common/internal/Tools.csproj

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions eng/common/templates-official/job/job.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

96 changes: 44 additions & 52 deletions eng/common/templates/job/job.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"xcopy-msbuild": "17.8.5"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24423.2"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24426.3"
}
}
4 changes: 3 additions & 1 deletion src/Build.UnitTests/BackEnd/BuildManager_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1513,11 +1513,13 @@ public void CancelledBuildWithUnexecutedSubmission()
_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>
/// A canceled build
/// </summary>
[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.");
string contents = CleanupFileContents(@"
Expand Down
2 changes: 1 addition & 1 deletion src/Build.UnitTests/Evaluation/Evaluator_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4400,7 +4400,7 @@ public void VerifyDTDProcessingIsDisabled()
/// </summary>
[Fact]
[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""?>
<!DOCTYPE Project [
Expand Down

0 comments on commit b82694a

Please sign in to comment.