Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/arcade (#75211)
Browse files Browse the repository at this point in the history
* Update dependencies from https://github.com/dotnet/arcade build 20240923.1

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 9.0.0-beta.24459.6 -> To Version 9.0.0-beta.24473.1

* Failed to perform coherency update for one or more dependencies.

* Update dependencies from https://github.com/dotnet/arcade build 20241001.3

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 9.0.0-beta.24473.1 -> To Version 9.0.0-beta.24501.3

* Failed to perform coherency update for one or more dependencies.

* Update dependencies from https://github.com/dotnet/arcade build 20241003.2

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 9.0.0-beta.24501.3 -> To Version 9.0.0-beta.24503.2

* Failed to perform coherency update for one or more dependencies.

* fix

* fix

* Update dependencies from https://github.com/dotnet/arcade build 20241008.3

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 9.0.0-beta.24503.2 -> To Version 9.0.0-beta.24508.3

* Update dependencies from https://github.com/dotnet/arcade build 20241009.3

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 9.0.0-beta.24508.3 -> To Version 9.0.0-beta.24509.3

* Failed to perform coherency update for one or more dependencies.

* skip tests

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jared Parsons <jared@paranoidcoding.org>
Co-authored-by: akhera99 <ankitakhera@microsoft.com>
  • Loading branch information
4 people authored Oct 15, 2024
1 parent 543d5d1 commit 09012a1
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 22 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,14 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24459.6">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24509.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>65260b148c869ada772a5843863c54737cd2361e</Sha>
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24459.6">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24509.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>65260b148c869ada772a5843863c54737cd2361e</Sha>
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</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 @@ -156,9 +156,9 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24459.6">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24509.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>65260b148c869ada772a5843863c54737cd2361e</Sha>
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23468.1">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
Expand Down
1 change: 1 addition & 0 deletions eng/common/templates-official/job/job.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
parameters:
# Sbom related params
enableSbom: true
runAsPublic: false
PackageVersion: 9.0.0
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'

Expand Down
1 change: 1 addition & 0 deletions eng/common/templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ parameters:
componentGovernanceIgnoreDirectories: ''
# Sbom related params
enableSbom: true
runAsPublic: false
PackageVersion: 9.0.0
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'

Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ function IsWindowsPlatform() {
}

function Get-Darc($version) {
$darcPath = "$TempDir\darc\$(New-Guid)"
$darcPath = "$TempDir\darc\$([guid]::NewGuid())"
if ($version -ne $null) {
& $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host
} else {
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"sdk": {
"version": "9.0.100-preview.7.24407.12",
"version": "9.0.100-rc.2.24474.11",
"allowPrerelease": false,
"rollForward": "patch"
},
"tools": {
"dotnet": "9.0.100-preview.7.24407.12",
"dotnet": "9.0.100-rc.2.24474.11",
"vs": {
"version": "17.8.0"
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24459.6",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24459.6",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24509.3",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24509.3",
"Microsoft.Build.Traversal": "3.4.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public override async Task InitializeAsync()
await TestServices.SolutionExplorer.AddProjectAsync(ProjectName, _projectTemplate, LanguageNames.VisualBasic, HangMitigatingCancellationToken);
}

[IdeFact]
[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/75458")]
public async Task UpdateActiveStatementLeafNode()
{
await TestServices.Editor.SetTextAsync(@"
Expand Down Expand Up @@ -78,7 +78,7 @@ End Module
await TestServices.Debugger.CheckExpressionAsync("names(1)", "String", "\"bar\"", HangMitigatingCancellationToken);
}

[IdeFact]
[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/75458")]
public async Task AddTryCatchAroundActiveStatement()
{
await TestServices.Editor.SetTextAsync(@"
Expand Down Expand Up @@ -107,7 +107,7 @@ Catch ex As Exception
await TestServices.EditorVerifier.CurrentLineTextAsync(" End Try", cancellationToken: HangMitigatingCancellationToken);
}

[IdeFact]
[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/75458")]
public async Task EditLambdaExpression()
{
await TestServices.Editor.SetTextAsync(@"
Expand Down Expand Up @@ -164,7 +164,7 @@ await TestServices.Workspace.WaitForAllAsyncOperationsAsync(
Assert.Empty(await TestServices.ErrorList.GetBuildErrorsAsync(HangMitigatingCancellationToken));
}

[IdeFact]
[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/75458")]
public async Task EnCWhileDebuggingFromImmediateWindow()
{
await TestServices.Editor.SetTextAsync(@"
Expand Down Expand Up @@ -227,7 +227,7 @@ End Module
await TestServices.Workspace.WaitForAsyncOperationsAsync(FeatureAttribute.Workspace, cancellationToken);
}

[IdeFact]
[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/75458")]
public async Task MultiProjectDebuggingWhereNotAllModulesAreLoaded()
{
await SetupMultiProjectSolutionAsync(HangMitigatingCancellationToken);
Expand All @@ -251,7 +251,7 @@ await TestServices.Workspace.WaitForAllAsyncOperationsAsync(
AssertEx.Empty(await TestServices.ErrorList.GetErrorsAsync(HangMitigatingCancellationToken));
}

[IdeFact]
[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/75458")]
public async Task LocalsWindowUpdatesAfterLocalGetsItsTypeUpdatedDuringEnC()
{
await TestServices.Editor.SetTextAsync(@"
Expand All @@ -275,7 +275,7 @@ End Module
Assert.Equal(("Single", "10"), await TestServices.LocalsWindow.GetEntryAsync(["goo"], HangMitigatingCancellationToken));
}

[IdeFact]
[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/75458")]
public async Task LocalsWindowUpdatesCorrectlyDuringEnC()
{
await TestServices.Editor.SetTextAsync(@"
Expand Down Expand Up @@ -309,7 +309,7 @@ End Module
Assert.Equal(("Long", "444"), await TestServices.LocalsWindow.GetEntryAsync(["lLng"], HangMitigatingCancellationToken));
}

[IdeFact]
[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/75458")]
public async Task WatchWindowUpdatesCorrectlyDuringEnC()
{
await TestServices.Editor.SetTextAsync(@"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Dim gibberish As SomeClass
Assert.False(await TestServices.Shell.IsActiveTabProvisionalAsync(HangMitigatingCancellationToken));
}

[IdeTheory, CombinatorialData]
[IdeTheory(Skip = "https://github.com/dotnet/roslyn/issues/75458"), CombinatorialData]
public async Task ObjectBrowserNavigation(bool navigateToObjectBrowser)
{
var globalOptions = await TestServices.Shell.GetComponentModelServiceAsync<IGlobalOptionService>(HangMitigatingCancellationToken);
Expand Down Expand Up @@ -85,7 +85,7 @@ End Class
}
}

[IdeFact]
[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/75458")]
public async Task GoToBaseFromMetadataAsSource()
{
var project = ProjectName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ protected async Task InitializeWithDefaultSolution()
await TestServices.SolutionExplorer.RestoreNuGetPackagesAsync(ProjectName, HangMitigatingCancellationToken);
}

[IdeFact]
[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/75458")]
public async Task OpenCSharpThenVBSolution()
{
await InitializeWithDefaultSolution();
Expand Down

0 comments on commit 09012a1

Please # to comment.