Skip to content

Commit 5aac555

Browse files
committed
Merge branch 'release/9.0.3xx' of https://github.com/dotnet/templating into merge/release/9.0.2xx-to-release/9.0.3xx
2 parents bf8503b + a756860 commit 5aac555

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
</Dependency>
2020
</ProductDependencies>
2121
<ToolsetDependencies>
22-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25255.5">
22+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25263.5">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
24+
<Sha>93823d49ca01742464ad1c0b49ea940e693b1be3</Sha>
2525
</Dependency>
2626
<!-- Intermediate is necessary for source build. -->
27-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25255.5">
27+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25263.5">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
29-
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
29+
<Sha>93823d49ca01742464ad1c0b49ea940e693b1be3</Sha>
3030
<SourceBuild RepoName="arcade" ManagedOnly="true" />
3131
</Dependency>
3232
<!-- Dependencies required for source build. We'll still update manually -->

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.105"
3+
"dotnet": "9.0.106"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.5"
6+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25263.5"
77
}
88
}

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)