Skip to content

Commit dfa12d8

Browse files
authored
Merge pull request #246 from microsoft/dev/andarno/libtemplateUpdate
Merge latest Library.Template and update xunit.v3 to v3
2 parents fb1f378 + 235db74 commit dfa12d8

File tree

5 files changed

+13
-10
lines changed

5 files changed

+13
-10
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Refer to https://hub.docker.com/_/microsoft-dotnet-sdk for available versions
2-
FROM mcr.microsoft.com/dotnet/sdk:9.0.301-noble@sha256:4fd7d3e5aeb6cfb75e923a54cdb0b6e858b27ad3b517837917c57c2e632b5694
2+
FROM mcr.microsoft.com/dotnet/sdk:9.0.303-noble@sha256:af75742bd2f6fd148504951b57a983bc410191729bf543eae467528d1bc175e5
33

44
# Installing mono makes `dotnet test` work without errors even for net472.
55
# But installing it takes a long time, so it's excluded by default.

CodeQL.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
path_classifiers:
2+
library:
3+
- 'test/**'

Directory.Packages.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
66
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
77

8-
<MicroBuildVersion>2.0.198</MicroBuildVersion>
8+
<MicroBuildVersion>2.0.199</MicroBuildVersion>
99
</PropertyGroup>
1010
<ItemGroup>
1111
<PackageVersion Include="MessagePack" Version="2.5.192" />
@@ -19,14 +19,14 @@
1919
<PackageVersion Include="System.ComponentModel.Composition" Version="9.0.0" />
2020
<PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
2121
<PackageVersion Include="xunit" Version="2.9.3" />
22-
<PackageVersion Include="xunit.v3.assert" Version="2.0.3" />
23-
<PackageVersion Include="xunit.v3.extensibility.core" Version="2.0.3" />
22+
<PackageVersion Include="xunit.v3.assert" Version="3.0.0" />
23+
<PackageVersion Include="xunit.v3.extensibility.core" Version="3.0.0" />
2424
</ItemGroup>
2525
<ItemGroup Label="Library.Template">
2626
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
2727
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
28-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
29-
<PackageVersion Include="xunit.v3" Version="2.0.3" />
28+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
29+
<PackageVersion Include="xunit.v3" Version="3.0.0" />
3030
</ItemGroup>
3131
<ItemGroup>
3232
<!-- Put repo-specific GlobalPackageReference items in this group. -->

azure-pipelines/microbuild.before.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ parameters:
1717
steps:
1818
- ${{ if and(not(parameters.IsOptProf), ne(variables['Build.Reason'], 'PullRequest')) }}:
1919
# notice@0 requires CG detection to run first, and non-default branches don't inject it automatically.
20-
- ${{ if ne(variables['Build.SourceBranch'], 'refs/heads/main') }}:
21-
- task: ComponentGovernanceComponentDetection@0
22-
displayName: 🔍 Component Detection
20+
# default branch injection (main) is happening too late for notice@0 to run successfully. Adding this as a workaround.
21+
- task: ComponentGovernanceComponentDetection@0
22+
displayName: 🔍 Component Detection
2323

2424
- task: notice@0
2525
displayName: 🛠️ Generate NOTICE file

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.301",
3+
"version": "9.0.303",
44
"rollForward": "patch",
55
"allowPrerelease": false
66
},

0 commit comments

Comments
 (0)