Skip to content

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx' #49375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Jun 13, 2025
Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ce3250b
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] May 28, 2025
0e597e1
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] May 29, 2025
0985fab
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into …
v-wuzhai Jun 5, 2025
39fbff6
Merge branch 'release/8.0.3xx' into darc-release/8.0.3xx-7fcd7a06-b65…
v-wuzhai Jun 5, 2025
d41d862
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into …
v-wuzhai Jun 6, 2025
4674618
[release/8.0.3xx] Update dependencies from dotnet/msbuild (#49176)
v-wuzhai Jun 6, 2025
44815de
[release/8.0.3xx] Trusted roots: 2025-05 CTL (#49271)
dtivel Jun 6, 2025
55e53cd
Update all test sdk references to the latest version.
marcpopMSFT Dec 18, 2024
22322ac
Revert two of the test files to unblock the test run. Need to reach o…
marcpopMSFT May 23, 2025
61177ba
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jun 11, 2025
70e6105
[release/8.0.3xx] Update dependencies from dotnet/arcade (#49338)
v-wuzhai Jun 11, 2025
0a1a7cf
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into …
v-wuzhai Jun 11, 2025
a8192de
[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' (#49342)
v-wuzhai Jun 11, 2025
1abf266
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Jun 12, 2025
ee8cb34
[release/8.0.4xx] Update dependencies from dotnet/templating (#49355)
SimonZhao888 Jun 12, 2025
b40b7b0
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/SDK into …
Jun 12, 2025
0d47399
[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' (#49359)
v-wuzhai Jun 12, 2025
986e33a
Update all test sdk references to the latest version. (#45548)
marcpopMSFT Jun 12, 2025
2c0a34f
Merge branch 'release/9.0.3xx' of https://github.com/dotnet/SDK into …
Jun 13, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
</ItemGroup>
Original file line number Diff line number Diff line change
@@ -152,7 +152,7 @@ public void TestSlnWithMultitargetedProject()
TargetFrameworks = ToolsetInfo.CurrentTargetFramework,
};

testProject.PackageReferences.Add(new TestPackageReference("Microsoft.NET.Test.Sdk", "16.7.1"));
testProject.PackageReferences.Add(new TestPackageReference("Microsoft.NET.Test.Sdk", "17.12.0"));
testProject.PackageReferences.Add(new TestPackageReference("xunit", "2.4.1"));
testProject.PackageReferences.Add(new TestPackageReference("xunit.runner.visualstudio", "2.4.3", privateAssets: "all"));