Skip to content

Commit 76eb0ec

Browse files
authored
[automated] Merge branch 'release/9.0.3xx' => 'main' (#50080)
2 parents bc7ab30 + c250a75 commit 76eb0ec

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<Reference Include="System.Net.Http" />
3636
<Reference Include="System.Xml" />
3737
<PackageReference Include="Microsoft.Web.Deployment" />
38-
<PackageReference Include="System.Text.Json" />
38+
<PackageReference Include="System.Text.Json" VersionOverride="$(PinnedSystemTextJsonPackageVersion)" />
3939
</ItemGroup>
4040
<ItemGroup>
4141
<Compile Include="**\*.cs" />

test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ public void EnableSingleFile_warns_when_expected_for_not_correctly_multitargeted
736736
testProject.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs
737737
var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks)
738738
.WithProjectChanges(AddTargetFrameworkAliases);
739-
739+
740740
var buildCommand = new BuildCommand(testAsset);
741741
var resultAssertion = buildCommand.Execute("/p:CheckEolTargetFramework=false")
742742
.Should().Pass();

0 commit comments

Comments
 (0)