Compare commits

...

5 Commits

4 changed files with 26 additions and 9 deletions

View File

@@ -50,7 +50,7 @@
<DefaultItemExcludes>$(DefaultItemExcludes);*.log;*.binlog</DefaultItemExcludes> <DefaultItemExcludes>$(DefaultItemExcludes);*.log;*.binlog</DefaultItemExcludes>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="$(ArtifactsPath) == ''"> <PropertyGroup Condition="$(ArtifactsPath) == '' AND $(DisableCustomArtifactsPath) != 'true'">
<ArtifactsPath>$(MSBuildThisFileDirectory)artifacts</ArtifactsPath> <ArtifactsPath>$(MSBuildThisFileDirectory)artifacts</ArtifactsPath>
</PropertyGroup> </PropertyGroup>
@@ -134,6 +134,12 @@
</AssemblyAttribute> </AssemblyAttribute>
</ItemGroup> </ItemGroup>
<!-- Use .NET ruleset for analyzers -->
<PropertyGroup Label="Code Analysis Ruleset"
Condition="Exists('$(MSBuildThisFileDirectory)\dotnet.ruleset')">
<CodeAnalysisRuleset>$(MSBuildThisFileDirectory)\dotnet.ruleset</CodeAnalysisRuleset>
</PropertyGroup>
<!-- Use readme as nuget information --> <!-- Use readme as nuget information -->
<ItemGroup Label="Readme" Condition="$(IsPackable) == 'True' AND $(ProjectReadMe) != ''"> <ItemGroup Label="Readme" Condition="$(IsPackable) == 'True' AND $(ProjectReadMe) != ''">
<None Include="$(ProjectReadMe)" Pack="true" PackagePath="" Visible="true"/> <None Include="$(ProjectReadMe)" Pack="true" PackagePath="" Visible="true"/>

View File

@@ -10,6 +10,7 @@
<UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner> <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport> <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
<RunSettingsFilePath>$(MSBuildThisFileDirectory)\.runsettings</RunSettingsFilePath> <RunSettingsFilePath>$(MSBuildThisFileDirectory)\.runsettings</RunSettingsFilePath>
<NoWarn>$(NoWarn);CA1707</NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup Label="Hide Assets"> <ItemGroup Label="Hide Assets">
@@ -65,4 +66,9 @@
<PackageReleaseNotes>@(ReleaseNoteLines, '%0a')</PackageReleaseNotes> <PackageReleaseNotes>@(ReleaseNoteLines, '%0a')</PackageReleaseNotes>
</PropertyGroup> </PropertyGroup>
</Target> </Target>
<Import
Condition="Exists('$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).EntityFrameworkCore.targets')"
Project="$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).EntityFrameworkCore.targets" />
</Project> </Project>

View File

@@ -1,6 +1,6 @@
<Project> <Project>
<ItemGroup Label="Packages"> <ItemGroup Label="Packages">
<PackageVersion Include="GitVersion.MsBuild" Version="6.3.0" /> <PackageVersion Include="GitVersion.MsBuild" Version="6.4.0" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.6" /> <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.6" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" /> <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" /> <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />

View File

@@ -1,19 +1,24 @@
workflow: GitFlow/v1 workflow: GitHubFlow/v1
mode: ContinuousDelivery mode: ContinuousDelivery
tag-prefix: '[vV]?'
ignore:
paths:
- ^(?!src\/|Directory\.Packages\.props|GitVersion.yml).*
branches: branches:
main:
mode: ContinuousDelivery
label: ''
develop: develop:
label: alpha label: 'beta'
regex: '^(dev|develop|development)$'
source-branches: source-branches:
- main - main
- feature
feature: feature:
mode: ContinuousDelivery mode: ContinuousDelivery
label: '{BranchName}'
source-branches: source-branches:
- develop - develop
hotfix:
regex: ^hotfix?[\/-](?<BranchName>.+)
mode: ContinuousDelivery
release:
mode: ContinuousDelivery
prevent-increment: prevent-increment:
of-merged-branch: true of-merged-branch: true