8000 [main] Source code updates from dotnet/templating (#342) · dotnet/dotnet@e9f84be · GitHub
[go: up one dir, main page]
Skip to content

Commit e9f84be

Browse files
dotnet-maestro[bot]ViktorHofer
dotnet-maestro[bot]
and
ViktorHofer
authored
[main] Source code updates from dotnet/templating (#342)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
1 parent d24d508 commit e9f84be

File tree

6 files changed

+13
-24
lines changed

6 files changed

+13
-24
lines changed

‎prereqs/git-info/templating.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4-
<GitCommitHash>2bb998b46268d8c38222a709ecf9fe8140df8393</GitCommitHash>
5-
<OfficialBuildId>20250430.1</OfficialBuildId>
6-
<OutputPackageVersion>10.0.100-preview.5.25230.1</OutputPackageVersion>
4+
<GitCommitHash>c32597769a4479ca82fc739a12ca11cd3b1d61e7</GitCommitHash>
5+
<OfficialBuildId>20250501.1</OfficialBuildId>
6+
<OutputPackageVersion>10.0.100-preview.5.25251.1</OutputPackageVersion>
77
</PropertyGroup>
88
</Project>

‎src/source-manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,11 @@
155155
"commitSha": "7f4f9c0ad18fc4dc74a906cec188adacd3847c9a"
156156
},
157157
{
158-
"packageVersion": "10.0.100-preview.5.25230.1",
159-
"barId": 266363,
158+
"packageVersion": "10.0.100-preview.5.25251.1",
159+
"barId": 266594,
160160
"path": "templating",
161161
"remoteUri": "https://github.com/dotnet/templating",
162-
"commitSha": "2bb998b46268d8c38222a709ecf9fe8140df8393"
162+
"commitSha": "c32597769a4479ca82fc739a12ca11cd3b1d61e7"
163163
},
164164
{
165165
"packageVersion": "17.15.0-preview-25224-01",

‎src/templating/eng/Version.Details.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="78c5fa9a48d469a19ab5a61c16c955c1f370b5be" BarId="266331" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="35ccf19f39389d127ab037709b8e9c5a1b111a20" BarId="266496" />
44
<ProductDependencies>
5-
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25229.109">
5+
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25230.108">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
7+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25229.109">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25230.108">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
13+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
1414
</Dependency>
1515
<!-- Dependencies required for source build. We'll still update manually -->
1616
<Dependency Name="System.Formats.Asn1" Version="9.0.3">

‎src/templating/eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PropertyGroup>
1616
<!-- Non-maestro versions -->
1717
<SystemFormatsAsn1Version>9.0.3</SystemFormatsAsn1Version>
18-
<SystemCommandLinePackageVersion>2.0.0-beta5.25229.109</SystemCommandLinePackageVersion>
18+
<SystemCommandLinePackageVersion>2.0.0-beta5.25230.108</SystemCommandLinePackageVersion>
1919
<MicrosoftExtensionsLoggingPackageVersion>9.0.3</MicrosoftExtensionsLoggingPackageVersion>
2020
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>9.0.3</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
2121
<MicrosoftExtensionsLoggingConsolePackageVersion>9.0.3</MicrosoftExtensionsLoggingConsolePackageVersion>

‎src/templating/eng/common/core-templates/steps/source-build.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,3 @@ steps:
121121
continueOnError: true
122122
condition: succeededOrFailed()
123123
sbomEnabled: false # we don't need SBOM for logs
124-
125-
# Manually inject component detection so that we can ignore the source build upstream cache, which contains
126-
# a nupkg cache of input packages (a local feed).
127-
# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir'
128-
# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets
129-
- template: /eng/common/core-templates/steps/component-governance.yml
130-
parameters:
131-
displayName: Component Detection (Exclude upstream cache)
132-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
133-
componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
134-
disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }}

‎src/templating/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"dotnet": "10.0.100-preview.3.25201.16"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25229.109"
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25230.108"
77
}
88
}

0 commit comments

Comments
 (0)
0