Skip to content

Commit 1e00ece

Browse files
[main] Update dependencies from dotnet/arcade (#1436)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 539120b commit 1e00ece

File tree

4 files changed

+15
-21
lines changed

4 files changed

+15
-21
lines changed

eng/Version.Details.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@
1515
</Dependency>
1616
</ProductDependencies>
1717
<ToolsetDependencies>
18-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22579.2">
18+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22605.1">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6</Sha>
20+
<Sha>c96d78299a4fe5557bd564e44b63725cdbabd960</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.22579.2">
22+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.22605.1">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6</Sha>
24+
<Sha>c96d78299a4fe5557bd564e44b63725cdbabd960</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.22579.2">
26+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.22605.1">
2727
<Uri>https://github.com/dotnet/arcade</Uri>
28-
<Sha>6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6</Sha>
28+
<Sha>c96d78299a4fe5557bd564e44b63725cdbabd960</Sha>
2929
</Dependency>
30-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22579.2">
30+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22605.1">
3131
<Uri>https://github.com/dotnet/arcade</Uri>
32-
<Sha>6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6</Sha>
32+
<Sha>c96d78299a4fe5557bd564e44b63725cdbabd960</Sha>
3333
</Dependency>
34-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.22579.2">
34+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.22605.1">
3535
<Uri>https://github.com/dotnet/arcade</Uri>
36-
<Sha>6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6</Sha>
36+
<Sha>c96d78299a4fe5557bd564e44b63725cdbabd960</Sha>
3737
</Dependency>
3838
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20258.6">
3939
<Uri>https://github.com/dotnet/arcade-services</Uri>

eng/Versions.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@
112112
<XUnitVersion>2.4.1</XUnitVersion>
113113
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
114114
<XUnitVSRunnerVersion>2.4.1</XUnitVSRunnerVersion>
115-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.22579.2</MicrosoftDotNetBuildTasksFeedVersion>
116-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.22579.2</MicrosoftDotNetSignToolVersion>
115+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.22605.1</MicrosoftDotNetBuildTasksFeedVersion>
116+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.22605.1</MicrosoftDotNetSignToolVersion>
117117
<MicrosoftAzureDocumentDBVersion>1.22.0</MicrosoftAzureDocumentDBVersion>
118118
<MicrosoftAzureCosmosDBTableVersion>1.1.2</MicrosoftAzureCosmosDBTableVersion>
119119
<MicrosoftAspNetCoreAllVersion>2.0.0</MicrosoftAspNetCoreAllVersion>
@@ -123,7 +123,7 @@
123123
<MicrosoftDotNetMaestroClientVersion>1.1.0-beta.20258.6</MicrosoftDotNetMaestroClientVersion>
124124
<MicrosoftSourceLinkGitHubVersion>1.1.0-beta-21228-01</MicrosoftSourceLinkGitHubVersion>
125125
<MicrosoftSourceLinkAzureReposGitVersion>1.1.0-beta-21228-01</MicrosoftSourceLinkAzureReposGitVersion>
126-
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>8.0.0-beta.22579.2</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
126+
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>8.0.0-beta.22605.1</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
127127
<XliffTasksVersion>1.0.0-beta.22513.1</XliffTasksVersion>
128128
<MicrosoftDotNetMaestroTasksVersion>1.1.0-beta.21228.1</MicrosoftDotNetMaestroTasksVersion>
129129
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21264.3</MicrosoftDotNetXHarnessCLIVersion>

eng/common/tools.sh

-6
Original file line numberDiff line numberDiff line change
@@ -416,12 +416,6 @@ function MSBuild {
416416
export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20
417417
Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20"
418418
Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20"
419-
420-
# https://github.com/dotnet/arcade/issues/11369 - disable new MSBuild server feature on linux
421-
# This feature is new and can result in build failures from connection timeout errors.
422-
export DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER=1
423-
Write-PipelineSetVariable -name "DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER" -value "1"
424-
425419
fi
426420

427421
local toolset_dir="${_InitializeToolset%/*}"

global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"vswhere": "2.5.2"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22579.2",
16-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22579.2",
15+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22605.1",
16+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22605.1",
1717
"MSBuild.Sdk.Extras": "3.0.44"
1818
}
1919
}

0 commit comments

Comments
 (0)