Skip to content
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

GitHubSync update #1031

Merged
merged 1 commit into from
Mar 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/Directory.Build.analyzers.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This file applies to all projects automatically and defines all default analyzers. Project specific values should go into Directory.Build.project.props
-->

<ItemGroup>
<ItemGroup Label="RepositoryTemplate.Analyzers.Packages">
<PackageReference Include="Catel.Analyzers" Version="1.6.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -26,7 +26,7 @@
</PackageReference>
</ItemGroup>

<PropertyGroup>
<PropertyGroup Label="RepositoryTemplate.Analyzers.Configuration">
<!--<EnableNETAnalyzers>True</EnableNETAnalyzers>
<AnalysisMode>AllEnabledByDefault</AnalysisMode>-->
<AnalysisLevel>latest</AnalysisLevel>
Expand All @@ -43,7 +43,7 @@
- CA2007: Consider calling ConfigureAwait on the awaited task
- CA2237: Mark types implementing ISerializable with [Serializable] attribute
-->
<PropertyGroup>
<PropertyGroup Label="RepositoryTemplate.Analyzers.Configuration.WarningsAndErrors">
<NoWarn>$(NoWarn);CA1030;CA1031;CA1054;CA1062;CA1724;CA1810;CA2007;CA2237</NoWarn>
<NoError>$(NoError);CA1030;CA1031;CA1054;CA1062;CA1724;CA810;CA2007;CA2237</NoError>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.implicitusings.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<PropertyGroup>
<PropertyGroup Label="RepositoryTemplate.ImplicitUsings.Configuration">
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Directory.Build.nullable.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<PropertyGroup>
<PropertyGroup Label="RepositoryTemplate.Nullable.Configuration">
<Nullable>enable</Nullable>
</PropertyGroup>
</Project>
127 changes: 82 additions & 45 deletions src/Directory.Build.shared.explicit.props

Large diffs are not rendered by default.

17 changes: 10 additions & 7 deletions src/Directory.Build.shared.implicit.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This file applies to projects automatically, but should not contain any project-specific information so it can easily be replaced
-->

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

<!-- CSharp language -->
<PropertyGroup>
<PropertyGroup Label="RepositoryTemplate.Implicit.Configuration.Language">
<LangVersion>latest</LangVersion>
</PropertyGroup>

<!-- Enforce portable pdb format -->
<PropertyGroup Condition="'$(Configuration)'=='Release'">
<PropertyGroup Label="RepositoryTemplate.Implicit.Configuration.Debugging.Release"
Condition="'$(Configuration)'=='Release'">
<DebugType>portable</DebugType>
<!-- Debug symbols are required for ApiApprover -->
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<!-- Enforce debug for non-web assembly projects -->
<PropertyGroup Condition="'$(Configuration)' == 'Debug' And '$(RuntimeIdentifier)' != 'browser-wasm'">
<PropertyGroup Label="RepositoryTemplate.Implicit.Configuration.Debugging.Debug"
Condition="'$(Configuration)' == 'Debug' And '$(RuntimeIdentifier)' != 'browser-wasm'">
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<!-- Browser-wasm requires portable debug type -->
<PropertyGroup Condition="'$(Configuration)' == 'Debug' And '$(RuntimeIdentifier)' == 'browser-wasm'">
<PropertyGroup Label="RepositoryTemplate.Implicit.Configuration.Debugging.Debug.Wasm"
Condition="'$(Configuration)' == 'Debug' And '$(RuntimeIdentifier)' == 'browser-wasm'">
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

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

<ItemGroup>
<ItemGroup Label="RepositoryTemplate.Implicit.Items">
<Compile Include="..\*.cs">
<SonarQubeExclude>true</SonarQubeExclude>
</Compile>
Expand Down
4 changes: 2 additions & 2 deletions src/Directory.Build.shared.tests.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Import Project="$(MSBuildProjectDirectory)\..\Directory.Build.shared.tests.props" Condition="Exists('$(MSBuildProjectDirectory)\..\Directory.Build.shared.tests.props')" />
-->

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

<ItemGroup>
<ItemGroup Label="RepositoryTemplate.Tests.Items">
<Compile Remove="*.approved.cs;*.received.cs" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Directory.Build.shared.tools.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<Import Project="$(MSBuildProjectDirectory)\..\Directory.Build.shared.tools.props" Condition="Exists('$(MSBuildProjectDirectory)\..\Directory.Build.shared.tools.props')" />
-->

<PropertyGroup>
<PropertyGroup Label="RepositoryTemplate.Tools.Configuration">
<PackageSummary>$(Description)</PackageSummary>
<ProjectSourceUrl>$(PackageProjectUrl)</ProjectSourceUrl>
<ExtrasIncludeDefaultProjectBuildOutputInPackTarget>IncludeDefaultProjectBuildOutputInPack</ExtrasIncludeDefaultProjectBuildOutputInPackTarget>
</PropertyGroup>

<ItemGroup>
<ItemGroup Label="RepositoryTemplate.Tests.Items">
<ToolLegalFiles Include="$(OutputPath)\**\legal\*.txt" />
<ToolDllFiles Include="$(OutputPath)\$(TargetFrameworks)\**\*.dll" />
<ToolExeFiles Include="$(OutputPath)\$(TargetFrameworks)\**\*.exe" />
Expand Down
6 changes: 3 additions & 3 deletions src/Directory.Build.shared.xamltools.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ItemGroup Label="RepositoryTemplate.XamlTools.Packages">
<PackageReference Include="XAMLTools.MSBuild" Version="1.0.0-alpha0085" PrivateAssets="all" />
</ItemGroup>

Expand All @@ -22,15 +22,15 @@
</ItemGroup>
-->

<ItemGroup>
<ItemGroup Label="RepositoryTemplate.XamlTools.Items">
<Page Remove="Themes\Generic.XamlTools.Disabled.xaml" />
<None Include="Themes\Generic.XamlTools.Disabled.xaml" />

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

<PropertyGroup>
<PropertyGroup Label="RepositoryTemplate.XamlTools.Configuration">
<XamlToolsDisable>false</XamlToolsDisable>
</PropertyGroup>

Expand Down
Loading