Skip to content

Commit ccd8ea0

Browse files
author
Mirroring
committed
Merge commit 'e531d207a838c9cec6f784aff12c833c9e75f4bb'
2 parents d585a38 + e531d20 commit ccd8ea0

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -589,34 +589,34 @@
589589
</Dependency>
590590
</ProductDependencies>
591591
<ToolsetDependencies>
592-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25058.5">
592+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25065.2">
593593
<Uri>https://github.com/dotnet/arcade</Uri>
594-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
594+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25058.5">
596+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25065.2">
597597
<Uri>https://github.com/dotnet/arcade</Uri>
598-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
598+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25058.5">
600+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25065.2">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
602+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25058.5">
604+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25065.2">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
606+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25058.5">
608+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25065.2">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
610+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25058.5">
612+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25065.2">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
614+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
615615
</Dependency>
616616
<!-- Intermediate is necessary for source build. -->
617-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25058.5">
617+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25065.2">
618618
<Uri>https://github.com/dotnet/arcade</Uri>
619-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
619+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
620620
<SourceBuild RepoName="arcade" ManagedOnly="true" />
621621
</Dependency>
622622
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.1">

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,10 @@
270270
</PropertyGroup>
271271
<PropertyGroup>
272272
<!-- Dependencies from https://github.com/dotnet/arcade -->
273-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25058.5</MicrosoftDotNetSignToolVersion>
275-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25058.5</MicrosoftDotNetXliffTasksVersion>
276-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25058.5</MicrosoftDotNetXUnitExtensionsVersion>
273+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25065.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25065.2</MicrosoftDotNetSignToolVersion>
275+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25065.2</MicrosoftDotNetXliffTasksVersion>
276+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25065.2</MicrosoftDotNetXUnitExtensionsVersion>
277277
</PropertyGroup>
278278
<PropertyGroup>
279279
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

eng/common/template-guidance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ extends:
5757
5858
Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`).
5959

60-
# Development notes
60+
## Development notes
6161

6262
**Folder / file structure**
6363

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ variables:
55
is1ESPipeline: true
66

77
${{ each parameter in parameters }}:
8-
${{ parameter.key }}: ${{ parameter.value }}
8+
${{ parameter.key }}: ${{ parameter.value }}

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100",
3+
"dotnet": "9.0.102",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25058.5",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25065.2",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)