Skip to content

Commit 734d070

Browse files
Merge pull request #1031 from Fody/GitHubSync/20250313-090554
GitHubSync update
2 parents e334841 + 80b8fc9 commit 734d070

8 files changed

+104
-64
lines changed

src/Directory.Build.analyzers.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
This file applies to all projects automatically and defines all default analyzers. Project specific values should go into Directory.Build.project.props
44
-->
55

6-
<ItemGroup>
6+
<ItemGroup Label="RepositoryTemplate.Analyzers.Packages">
77
<PackageReference Include="Catel.Analyzers" Version="1.6.1">
88
<PrivateAssets>all</PrivateAssets>
99
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -26,7 +26,7 @@
2626
</PackageReference>
2727
</ItemGroup>
2828

29-
<PropertyGroup>
29+
<PropertyGroup Label="RepositoryTemplate.Analyzers.Configuration">
3030
<!--<EnableNETAnalyzers>True</EnableNETAnalyzers>
3131
<AnalysisMode>AllEnabledByDefault</AnalysisMode>-->
3232
<AnalysisLevel>latest</AnalysisLevel>
@@ -43,7 +43,7 @@
4343
- CA2007: Consider calling ConfigureAwait on the awaited task
4444
- CA2237: Mark types implementing ISerializable with [Serializable] attribute
4545
-->
46-
<PropertyGroup>
46+
<PropertyGroup Label="RepositoryTemplate.Analyzers.Configuration.WarningsAndErrors">
4747
<NoWarn>$(NoWarn);CA1030;CA1031;CA1054;CA1062;CA1724;CA1810;CA2007;CA2237</NoWarn>
4848
<NoError>$(NoError);CA1030;CA1031;CA1054;CA1062;CA1724;CA810;CA2007;CA2237</NoError>
4949
</PropertyGroup>
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
2-
<PropertyGroup>
2+
<PropertyGroup Label="RepositoryTemplate.ImplicitUsings.Configuration">
33
<ImplicitUsings>enable</ImplicitUsings>
44
</PropertyGroup>
55
</Project>

src/Directory.Build.nullable.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
2-
<PropertyGroup>
2+
<PropertyGroup Label="RepositoryTemplate.Nullable.Configuration">
33
<Nullable>enable</Nullable>
44
</PropertyGroup>
55
</Project>

src/Directory.Build.shared.explicit.props

+82-45
Large diffs are not rendered by default.

src/Directory.Build.shared.implicit.props

+10-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
This file applies to projects automatically, but should not contain any project-specific information so it can easily be replaced
44
-->
55

6-
<PropertyGroup>
6+
<PropertyGroup Label="RepositoryTemplate.Implicit.Configuration">
77
<NoWarn>$(NoWarn);CA1416;CS1591;CS1998;NU1603;NU1605;NU1608;NU1701;AD0001;HAA0301;HAA0302;HAA0303;HAA0401;HAA0603</NoWarn>
88
<NoError>$(NoError);CS1591;CS1998;NU1603;NU1605;NU1608;NU1701;AD0001;HAA0301;HAA0302;HAA0303;HAA0401;HAA0603</NoError>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -30,38 +30,41 @@
3030
</Target>
3131

3232
<!-- CSharp language -->
33-
<PropertyGroup>
33+
<PropertyGroup Label="RepositoryTemplate.Implicit.Configuration.Language">
3434
<LangVersion>latest</LangVersion>
3535
</PropertyGroup>
3636

3737
<!-- Enforce portable pdb format -->
38-
<PropertyGroup Condition="'$(Configuration)'=='Release'">
38+
<PropertyGroup Label="RepositoryTemplate.Implicit.Configuration.Debugging.Release"
39+
Condition="'$(Configuration)'=='Release'">
3940
<DebugType>portable</DebugType>
4041
<!-- Debug symbols are required for ApiApprover -->
4142
<DebugSymbols>true</DebugSymbols>
4243
</PropertyGroup>
4344

4445
<!-- Enforce debug for non-web assembly projects -->
45-
<PropertyGroup Condition="'$(Configuration)' == 'Debug' And '$(RuntimeIdentifier)' != 'browser-wasm'">
46+
<PropertyGroup Label="RepositoryTemplate.Implicit.Configuration.Debugging.Debug"
47+
Condition="'$(Configuration)' == 'Debug' And '$(RuntimeIdentifier)' != 'browser-wasm'">
4648
<DebugType>portable</DebugType>
4749
<DebugSymbols>true</DebugSymbols>
4850
</PropertyGroup>
4951

5052
<!-- Browser-wasm requires portable debug type -->
51-
<PropertyGroup Condition="'$(Configuration)' == 'Debug' And '$(RuntimeIdentifier)' == 'browser-wasm'">
53+
<PropertyGroup Label="RepositoryTemplate.Implicit.Configuration.Debugging.Debug.Wasm"
54+
Condition="'$(Configuration)' == 'Debug' And '$(RuntimeIdentifier)' == 'browser-wasm'">
5255
<DebugType>portable</DebugType>
5356
<DebugSymbols>true</DebugSymbols>
5457
</PropertyGroup>
5558

5659
<!-- NuGet auditing, see https://learn.microsoft.com/en-us/nuget/concepts/auditing-packages -->
57-
<PropertyGroup>
60+
<PropertyGroup Label="RepositoryTemplate.Implicit.Configuration.NuGet">
5861
<!-- 'all' means even indirect packages, 'direct' means only direct dependencies -->
5962
<NuGetAuditMode>direct</NuGetAuditMode>
6063
<!-- Low means even low vulnerabilities will be reported -->
6164
<NuGetAuditLevel>low</NuGetAuditLevel>
6265
</PropertyGroup>
6366

64-
<ItemGroup>
67+
<ItemGroup Label="RepositoryTemplate.Implicit.Items">
6568
<Compile Include="..\*.cs">
6669
<SonarQubeExclude>true</SonarQubeExclude>
6770
</Compile>

src/Directory.Build.shared.tests.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Import Project="$(MSBuildProjectDirectory)\..\Directory.Build.shared.tests.props" Condition="Exists('$(MSBuildProjectDirectory)\..\Directory.Build.shared.tests.props')" />
66
-->
77

8-
<PropertyGroup>
8+
<PropertyGroup Label="RepositoryTemplate.Tests.Configuration">
99
<IsPackable>false</IsPackable>
1010
<IsTestProject>true</IsTestProject>
1111
</PropertyGroup>
@@ -18,7 +18,7 @@
1818
</Target>
1919
<!-- END: This is a buildtime work around for https://github.com/dotnet/corefx/issues/22101 -->
2020

21-
<ItemGroup>
21+
<ItemGroup Label="RepositoryTemplate.Tests.Items">
2222
<Compile Remove="*.approved.cs;*.received.cs" />
2323
</ItemGroup>
2424

src/Directory.Build.shared.tools.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<Import Project="$(MSBuildProjectDirectory)\..\Directory.Build.shared.tools.props" Condition="Exists('$(MSBuildProjectDirectory)\..\Directory.Build.shared.tools.props')" />
66
-->
77

8-
<PropertyGroup>
8+
<PropertyGroup Label="RepositoryTemplate.Tools.Configuration">
99
<PackageSummary>$(Description)</PackageSummary>
1010
<ProjectSourceUrl>$(PackageProjectUrl)</ProjectSourceUrl>
1111
<ExtrasIncludeDefaultProjectBuildOutputInPackTarget>IncludeDefaultProjectBuildOutputInPack</ExtrasIncludeDefaultProjectBuildOutputInPackTarget>
1212
</PropertyGroup>
1313

14-
<ItemGroup>
14+
<ItemGroup Label="RepositoryTemplate.Tests.Items">
1515
<ToolLegalFiles Include="$(OutputPath)\**\legal\*.txt" />
1616
<ToolDllFiles Include="$(OutputPath)\$(TargetFrameworks)\**\*.dll" />
1717
<ToolExeFiles Include="$(OutputPath)\$(TargetFrameworks)\**\*.exe" />

src/Directory.Build.shared.xamltools.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ItemGroup>
3+
<ItemGroup Label="RepositoryTemplate.XamlTools.Packages">
44
<PackageReference Include="XAMLTools.MSBuild" Version="1.0.0-alpha0085" PrivateAssets="all" />
55
</ItemGroup>
66

@@ -22,15 +22,15 @@
2222
</ItemGroup>
2323
-->
2424

25-
<ItemGroup>
25+
<ItemGroup Label="RepositoryTemplate.XamlTools.Items">
2626
<Page Remove="Themes\Generic.XamlTools.Disabled.xaml" />
2727
<None Include="Themes\Generic.XamlTools.Disabled.xaml" />
2828

2929
<Page Remove="Themes\Generic.XamlTools.Enabled.xaml" />
3030
<None Include="Themes\Generic.XamlTools.Enabled.xaml" />
3131
</ItemGroup>
3232

33-
<PropertyGroup>
33+
<PropertyGroup Label="RepositoryTemplate.XamlTools.Configuration">
3434
<XamlToolsDisable>false</XamlToolsDisable>
3535
</PropertyGroup>
3636

0 commit comments

Comments
 (0)