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

Commit 7d4ec06

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/templating (#609)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent a55e782 commit 7d4ec06

File tree

5 files changed

+17
-22
lines changed

5 files changed

+17
-22
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>db6256f5f72d0b954273e94f616f1bf0ba9c443c</GitCommitHash>
5-
<OfficialBuildId>20250511.1</OfficialBuildId>
6-
<OutputPackageVersion>10.0.100-preview.5.25261.1</OutputPackageVersion>
4+
<GitCommitHash>297983ef280be4b32f0d36b5bb2742b8e6e947b3</GitCommitHash>
5+
<OfficialBuildId>20250516.4</OfficialBuildId>
6+
<OutputPackageVersion>10.0.100-preview.5.25266.4</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": "d38d92c12935201bb8852096935c267d53592ad9"
156156
},
157157
{
158-
"packageVersion": "10.0.100-preview.5.25261.1",
159-
"barId": 267808,
158+
"packageVersion": "10.0.100-preview.5.25266.4",
159+
"barId": 268676,
160160
"path": "templating",
161161
"remoteUri": "https://github.com/dotnet/templating",
162-
"commitSha": "db6256f5f72d0b954273e94f616f1bf0ba9c443c"
162+
"commitSha": "297983ef280be4b32f0d36b5bb2742b8e6e947b3"
163163
},
164164
{
165165
"packageVersion": "17.15.0-preview-25224-01",

‎src/templating/eng/common/sdl/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Guardian.Cli" version="0.199.0"/>
3+
<package id="Microsoft.Guardian.Cli" version="0.109.0"/>
44
</packages>

‎src/templating/github-merge-flow.jsonc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,8 @@
1616
"MergeToBranch": "release/9.0.1xx",
1717
"ExtraSwitches": "-QuietComments"
1818
},
19-
// Automate opening PRs to merge sdk repos from release/9.0.1xx to release/9.0.2xx
19+
// Automate opening PRs to merge sdk repos from release/9.0.1xx to release/9.0.3xx
2020
"release/9.0.1xx":{
21-
"MergeToBranch": "release/9.0.2xx",
22-
"ExtraSwitches": "-QuietComments"
23-
},
24-
// Automate opening PRs to merge sdk repos from release/9.0.2xx to release/9.0.3xx
25-
"release/9.0.2xx":{
2621
"MergeToBranch": "release/9.0.3xx",
2722
"ExtraSwitches": "-QuietComments"
2823
},

‎src/templating/test/Microsoft.TemplateEngine.Edge.UnitTests/NuGetApiPackageManagerTests.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,13 @@ internal async Task DownloadPackage_HasVulnerabilities()
146146

147147
var exception = await Assert.ThrowsAsync<VulnerablePackageException>(() => packageManager.DownloadPackageAsync(
148148
installPath,
149-
"log4net",
150-
"2.0.3",
149+
"System.Text.Json",
150+
"8.0.4",
151151
// add the source for getting vulnerability info
152152
additionalSources: _additionalSources));
153153

154-
exception.PackageIdentifier.Should().Be("log4net");
155-
exception.PackageVersion.Should().Be("2.0.3");
154+
exception.PackageIdentifier.Should().Be("System.Text.Json");
155+
exception.PackageVersion.Should().Be("8.0.4");
156156
exception.Vulnerabilities.Should().NotBeNullOrEmpty();
157157
}
158158

@@ -167,15 +167,15 @@ internal async Task DownloadPackage_HasVulnerabilitiesForce()
167167

168168
var result = await packageManager.DownloadPackageAsync(
169169
installPath,
170-
"log4net",
171-
"2.0.3",
170+
"System.Text.Json",
171+
"8.0.4",
172172
// add the source for getting vulnerability info
173173
additionalSources: _additionalSources,
174174
force: true);
175175

176-
result.PackageIdentifier.Should().Be("log4net");
177-
result.Author.Should().Be("Apache Software Foundation");
178-
result.PackageVersion.Should().Be("2.0.3");
176+
result.PackageIdentifier.Should().Be("System.Text.Json");
177+
result.Author.Should().Be("Microsoft");
178+
result.PackageVersion.Should().Be("8.0.4");
179179
Assert.True(File.Exists(result.FullPath));
180180
result.PackageVulnerabilities.Should().NotBeNullOrEmpty();
181181
result.NuGetSource.Should().Be(_additionalSources[0]);

0 commit comments

Comments
 (0)
0