Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release/dev17.10 to release/dev17.11 #75541

Merged
merged 9 commits into from
Oct 22, 2024
Merged

Merge release/dev17.10 to release/dev17.11 #75541

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c29c6dd
Update STJ
Cosifne Sep 18, 2024
f2ba7cf
Merged PR 43018: Flow public release dev17.10 to internal/release/dev…
Cosifne Sep 18, 2024
ea280d3
Merge remote-tracking branch 'dnceng/internal/release/dev17.10' into …
Cosifne Sep 18, 2024
154f8a3
Merged PR 43023: Update STJ in 17.10 branch
Cosifne Sep 18, 2024
44e2f0e
Merge remote-tracking branch 'azdo-dnceng-internal/internal/release/d…
mmitche Oct 10, 2024
7642cb7
Update NuGet.config
mmitche Oct 10, 2024
e36f075
Merge pull request #75471 from mmitche/merge-from-internal-17.10
mmitche Oct 11, 2024
e29d0b7
[release/dev17.10] Update dependencies from dotnet/arcade (#75252)
dotnet-maestro[bot] Oct 15, 2024
c23b6b5
Merge remote-tracking branch 'upstream/release/dev17.10' into merges/…
akhera99 Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,14 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24475.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24508.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0</Sha>
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24475.3">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24508.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0</Sha>
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</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 @@ -148,9 +148,9 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24475.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24508.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0</Sha>
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23468.1">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"sdk": {
"version": "8.0.108",
"version": "8.0.110",
"allowPrerelease": false,
"rollForward": "patch"
},
"tools": {
"dotnet": "8.0.108",
"dotnet": "8.0.110",
"vs": {
"version": "17.8.0"
},
"xcopy-msbuild": "17.8.1-2"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24475.3",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24475.3",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24508.1",
"Microsoft.Build.Traversal": "3.4.0"
}
}
2 changes: 1 addition & 1 deletion ...kspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<PackageReference Include="Microsoft.Build.Tasks.Core" VersionOverride="17.3.4" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Utilities.Core" VersionOverride="17.3.4" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Locator" PrivateAssets="All" />
<PackageReference Include="System.Text.Json" VersionOverride="8.0.4" PrivateAssets="All" Condition="'$(DotnetBuildFromSource)' != 'true'"/>
<PackageReference Include="System.Text.Json" VersionOverride="8.0.5" PrivateAssets="All" Condition="'$(DotnetBuildFromSource)' != 'true'"/>
<PackageReference Include="System.CommandLine" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
<PackageReference Include="Newtonsoft.Json" />
Expand Down
Loading