Skip to content

Commit 4e49442

Browse files
dotnet-maestro-botForgindJanKrivaneksujitnayakYuliiaKovalova
authored
[automated] Merge branch 'vs17.9' => 'vs17.10' (#10081)
* Dont ngen taskhost Fixes our lack of optprof data (#8737) Don't ngen TaskHosts * Bump version * Bump version * Update System.Security.Cryptography.Pkcs * Bump version * Workaround for incorrect encoding of PUA range in GB18030 Uri string (#9751) * [release/vs17.7] Onboard 1es templates (#9924) * bump arcade version * bump MicrosoftNetCompilersToolsetVersion * bump MicrosoftNetCompilersToolsetVersion * update sha for Microsoft.Net.Compilers.Toolset * update darc * update arcade channel .net 8 * update arcade * Changed pool image --------- Co-authored-by: Forgind <[email protected]> Co-authored-by: Jan Krivanek <[email protected]> Co-authored-by: sujitnayak <[email protected]> Co-authored-by: YuliiaKovalova <[email protected]> Co-authored-by: YuliiaKovalova <[email protected]> Co-authored-by: Surayya Huseyn Zada <[email protected]> Co-authored-by: Surayya Huseyn Zada <[email protected]> Co-authored-by: Mariana Dematte <[email protected]>
1 parent 6a555e1 commit 4e49442

File tree

13 files changed

+25
-23
lines changed

13 files changed

+25
-23
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@
6767
</Dependency>
6868
</ProductDependencies>
6969
<ToolsetDependencies>
70-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24172.5">
70+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24225.1">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>ceb071c1060b8e6de404c065b4045442570caa18</Sha>
72+
<Sha>67d23f4ba1813b315e7e33c71d18b63475f5c5f8</Sha>
7373
</Dependency>
7474
<!-- Intermediate is necessary for source build. -->
75-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24172.5">
75+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24225.1">
7676
<Uri>https://github.com/dotnet/arcade</Uri>
77-
<Sha>ceb071c1060b8e6de404c065b4045442570caa18</Sha>
77+
<Sha>67d23f4ba1813b315e7e33c71d18b63475f5c5f8</Sha>
7878
<SourceBuild RepoName="arcade" ManagedOnly="true" />
7979
</Dependency>
8080
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
@@ -96,9 +96,9 @@
9696
<Sha>919d4dbfb0dffb35a702417e28ceea652d248bc6</Sha>
9797
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24172.5">
99+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24225.1">
100100
<Uri>https://github.com/dotnet/arcade</Uri>
101-
<Sha>ceb071c1060b8e6de404c065b4045442570caa18</Sha>
101+
<Sha>67d23f4ba1813b315e7e33c71d18b63475f5c5f8</Sha>
102102
</Dependency>
103103
</ToolsetDependencies>
104104
</Dependencies>

eng/Versions.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
33
<Project>
44
<PropertyGroup>
5-
<VersionPrefix>17.10.5</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
5+
<VersionPrefix>17.10.6</VersionPrefix>
6+
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
67
<PackageValidationBaselineVersion>17.8.3</PackageValidationBaselineVersion>
78
<AssemblyVersion>15.1.0.0</AssemblyVersion>
89
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
@@ -48,7 +49,7 @@
4849
Otherwise, this version of dotnet will not be installed and the build will error out. -->
4950
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
5051
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
51-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24172.5</MicrosoftDotNetXUnitExtensionsVersion>
52+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24225.1</MicrosoftDotNetXUnitExtensionsVersion>
5253
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
5354
<MicrosoftIORedistVersion>6.0.0</MicrosoftIORedistVersion>
5455
<MicrosoftNetCompilersToolsetVersion>4.10.0-3.24175.2</MicrosoftNetCompilersToolsetVersion>

eng/common/native/init-compiler.sh

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eng/common/templates-official/job/job.yml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eng/common/templates-official/job/onelocbuild.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eng/common/templates-official/job/publish-build-assets.yml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eng/common/templates-official/job/source-build.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eng/common/templates-official/job/source-index-stage1.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eng/common/templates-official/post-build/post-build.yml

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eng/common/templates-official/steps/component-governance.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eng/common/templates-official/variables/pool-providers.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eng/common/templates/steps/component-governance.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
"xcopy-msbuild": "17.8.5"
1111
},
1212
"msbuild-sdks": {
13-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24172.5"
13+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24225.1"
1414
}
1515
}

0 commit comments

Comments
 (0)