Skip to content

Commit

Permalink
Update libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
kzrnm committed Nov 30, 2020
1 parent c47380f commit 199630f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 21 deletions.
23 changes: 10 additions & 13 deletions .github/workflows/unittest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,51 +6,48 @@ on:
- master
paths:
- ".github/workflows/**"
- "**.cs"
- "**"
- "!**.md"
pull_request:
paths:
- ".github/workflows/**"
- "**.cs"
- "**"
- "!**.md"

env:
DOTNET_CLI_TELEMETRY_OPTOUT: true
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_NOLOGO: true
NUGET_XMLDOC_MODE: skip
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
WORKFLOW_BUILD_SLN: AtCoderLibrary.sln

jobs:
format:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.100
- name: Install dotnet-format
run: dotnet tool install --global dotnet-format
- name: Format
run: dotnet format AtCoderLibrary.sln --check --dry-run
run: dotnet format ${{ env.WORKFLOW_BUILD_SLN }} --check --dry-run
test:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Setup .NET Core SDK
- name: Setup .NET SDK
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.100
dotnet-version: 3.1.x
- uses: actions/cache@v2
with:
path: ${{ github.workspace }}/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: |
${{ runner.os }}-nuget-
- name: Install dependencies
run: dotnet restore AtCoderLibrary.sln
run: dotnet restore ${{ env.WORKFLOW_BUILD_SLN }}
- name: Build
run: dotnet build AtCoderLibrary.sln --no-restore
run: dotnet build ${{ env.WORKFLOW_BUILD_SLN }} --no-restore
- name: Test
run: dotnet test AtCoderLibrary.sln --no-restore --verbosity normal
run: dotnet test ${{ env.WORKFLOW_BUILD_SLN }} --no-restore --verbosity normal
2 changes: 1 addition & 1 deletion AtCoderLibrary.Test/AtCoderLibrary.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>

<IsPackable>false</IsPackable>
<RootNamespace>AtCoder</RootNamespace>
Expand Down
6 changes: 2 additions & 4 deletions AtCoderLibrary/AtCoderLibrary.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
</PropertyGroup>

<ItemGroup>
<None Include="FodyWeavers.xml" Visible="false" />
<None Include="..\LICENSE">
<Pack>True</Pack>
<PackagePath></PackagePath>
Expand All @@ -36,13 +35,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="SourceExpander.Embedder" Version="1.1.0">
<PackageReference Include="SourceExpander.Embedder" Version="2.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SourceExpander.Core" Version="1.1.0" />
<PackageReference Include="SourceExpander.Core" Version="2.1.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
<PackageReference Include="ModuleInit.Fody" Version="2.1.1" PrivateAssets="all" />
</ItemGroup>

</Project>
3 changes: 0 additions & 3 deletions AtCoderLibrary/FodyWeavers.xml

This file was deleted.

0 comments on commit 199630f

Please sign in to comment.