This commit is contained in:
Patrik Svensson 2022-02-10 21:44:59 +01:00
Родитель 4dcd8d0a6d
Коммит 7aa230e83f
9 изменённых файлов: 24 добавлений и 45 удалений

9
.github/workflows/ci.yaml поставляемый
Просмотреть файл

@ -37,15 +37,10 @@ jobs:
run: git fetch --tags
shell: bash
- name: Setup dotnet 5.0
- name: Setup .NET SDK
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.403
- name: Setup dotnet 6.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 6.0.101
- name: Build
shell: bash

18
.github/workflows/publish.yaml поставляемый
Просмотреть файл

@ -43,15 +43,10 @@ jobs:
run: git fetch --tags
shell: bash
- name: Setup dotnet 5.0
- name: Setup .NET SDK
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.403
- name: Setup dotnet 6.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 6.0.101
- name: Build
shell: bash
@ -78,15 +73,10 @@ jobs:
run: git fetch --tags
shell: bash
- name: Setup dotnet 5.0
- name: Setup .NET SDK
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.403
- name: Setup dotnet 6.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 6.0.101
- name: Publish
shell: bash

Просмотреть файл

@ -7,10 +7,10 @@ var configuration = Argument("configuration", "Release");
Task("Build")
.Does(context =>
{
DotNetCoreBuild("./src/Errata.sln", new DotNetCoreBuildSettings {
DotNetBuild("./src/Errata.sln", new DotNetBuildSettings {
Configuration = configuration,
NoIncremental = context.HasArgument("rebuild"),
MSBuildSettings = new DotNetCoreMSBuildSettings()
MSBuildSettings = new DotNetMSBuildSettings()
.TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error)
});
});
@ -19,7 +19,7 @@ Task("Test")
.IsDependentOn("Build")
.Does(context =>
{
DotNetCoreTest("./src/Errata.sln", new DotNetCoreTestSettings {
DotNetTest("./src/Errata.sln", new DotNetTestSettings {
Configuration = configuration,
NoRestore = true,
NoBuild = true,
@ -32,12 +32,12 @@ Task("Package")
{
context.CleanDirectory("./.artifacts");
context.DotNetCorePack($"./src/Errata.sln", new DotNetCorePackSettings {
context.DotNetPack($"./src/Errata.sln", new DotNetPackSettings {
Configuration = configuration,
NoRestore = true,
NoBuild = true,
OutputDirectory = "./.artifacts",
MSBuildSettings = new DotNetCoreMSBuildSettings()
MSBuildSettings = new DotNetMSBuildSettings()
.TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error)
});
});
@ -56,7 +56,7 @@ Task("Publish-NuGet")
foreach(var file in context.GetFiles("./.artifacts/*.nupkg"))
{
context.Information("Publishing {0}...", file.GetFilename().FullPath);
DotNetCoreNuGetPush(file.FullPath, new DotNetCoreNuGetPushSettings
DotNetNuGetPush(file.FullPath, new DotNetNuGetPushSettings
{
Source = "https://api.nuget.org/v3/index.json",
ApiKey = apiKey,

Просмотреть файл

@ -3,13 +3,13 @@
"isRoot": true,
"tools": {
"cake.tool": {
"version": "2.0.0-rc0001",
"version": "2.0.0",
"commands": [
"dotnet-cake"
]
},
"dotnet-example": {
"version": "1.4.0",
"version": "1.6.0",
"commands": [
"dotnet-example"
]

Просмотреть файл

@ -35,12 +35,6 @@ namespace Example
.WithLabel(new Label("Demo/Files/Program.cs", 174..176, "Code should not contain trailing whitespace")
.WithColor(Color.Blue));
report.AddDiagnostic(
Diagnostic.Info("Fix formatting")
.WithCode("IDE0055"))
.WithLabel(new Label("Demo/Files/Program.cs", 1742..1762, "Code should not contain trailing whitespace")
.WithColor(Color.Blue));
// Markdown
report.AddDiagnostic(
Diagnostic.Error("There were markdown errors")

Просмотреть файл

@ -1,7 +1,7 @@
{
"projects": [ "src" ],
"sdk": {
"version": "6.0.100",
"version": "6.0.101",
"rollForward": "latestFeature"
}
}

Просмотреть файл

@ -1,7 +1,7 @@
<Project>
<PropertyGroup Label="Settings">
<Deterministic>true</Deterministic>
<LangVersion>9.0</LangVersion>
<LangVersion>10</LangVersion>
<DebugSymbols>true</DebugSymbols>
<DebugType>embedded</DebugType>
<MinVerSkip Condition="'$(Configuration)' == 'Debug'">true</MinVerSkip>
@ -34,15 +34,15 @@
<ItemGroup Label="Package References">
<PackageReference Include="MinVer" PrivateAssets="All" Version="2.5.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="1.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="1.1.1" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354">
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="Roslynator.Analyzers" Version="3.2.0">
<PackageReference Include="Roslynator.Analyzers" Version="4.0.2">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>

Просмотреть файл

@ -21,11 +21,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Shouldly" Version="4.0.3" />
<PackageReference Include="Spectre.Console.Testing" Version="0.41.0" />
<PackageReference Include="Spectre.Verify.Extensions" Version="0.4.0" />
<PackageReference Include="Verify.Xunit" Version="11.23.1" />
<PackageReference Include="Spectre.Console.Testing" Version="0.43.0" />
<PackageReference Include="Spectre.Verify.Extensions" Version="0.5.0" />
<PackageReference Include="Verify.Xunit" Version="16.1.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>

Просмотреть файл

@ -27,7 +27,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Spectre.Console" Version="0.41.0" />
<PackageReference Include="Spectre.Console" Version="0.43.0" />
</ItemGroup>
</Project>