Skip to content
Closed
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
9 changes: 7 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@ on:
branches: ["main"]
pull_request:
branches: ["main"]
workflow_dispatch:

jobs:
build:
runs-on: windows-latest
env:
HUSKY: 0 # don't run husky.net hooks

steps:
- name: Checkout code
Expand All @@ -30,11 +33,13 @@ jobs:
8.0.x
9.0.x

- name: Restore dotnet tools
- name: Restore .NET tools
run: dotnet tool restore
working-directory: .

- name: Restore dependencies
run: dotnet restore ./src
run: dotnet restore
working-directory: ./src

- name: Build
run: dotnet build ./src --no-restore -p:VersionFromCI="0.0.0-cibuild"
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ on:
jobs:
build:
runs-on: ubuntu-latest
env:
HUSKY: 0 # don't run husky.net hooks

steps:
- name: Checkout code
Expand All @@ -30,11 +32,13 @@ jobs:
id: extract_version
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV

- name: Restore dotnet tools
- name: Restore .NET tools
run: dotnet tool restore
working-directory: .

- name: Restore dependencies
run: dotnet restore ./src
run: dotnet restore
working-directory: ./src

- name: Build
run: dotnet build ./src --no-restore --configuration Release /p:VersionFromCI=${{ env.VERSION }}
Expand Down
41 changes: 8 additions & 33 deletions src/NetDuid.Tests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,6 @@
"Microsoft.CodeCoverage": "17.13.0"
}
},
"Microsoft.NETFramework.ReferenceAssemblies": {
"type": "Direct",
"requested": "[1.0.3, )",
"resolved": "1.0.3",
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
"dependencies": {
"Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
}
},
"Roslynator.Analyzers": {
"type": "Direct",
"requested": "[4.13.1, )",
Expand Down Expand Up @@ -97,11 +88,6 @@
"resolved": "17.13.0",
"contentHash": "9LIUy0y+DvUmEPtbRDw6Bay3rzwqFV8P4efTrK4CZhQle3M/QwLPjISghfcolmEGAPWxuJi6m98ZEfk4VR4Lfg=="
},
"Microsoft.NETFramework.ReferenceAssemblies.net48": {
"type": "Transitive",
"resolved": "1.0.3",
"contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
},
"Microsoft.Testing.Extensions.TrxReport.Abstractions": {
"type": "Transitive",
"resolved": "1.6.3",
Expand Down Expand Up @@ -252,6 +238,7 @@
}
}
},
".NETFramework,Version=v4.8/win-x86": {},
"net6.0": {
"coverlet.collector": {
"type": "Direct",
Expand Down Expand Up @@ -463,6 +450,7 @@
"type": "Project"
}
},
"net6.0/win-x86": {},
"net7.0": {
"coverlet.collector": {
"type": "Direct",
Expand Down Expand Up @@ -674,6 +662,7 @@
"type": "Project"
}
},
"net7.0/win-x86": {},
"net8.0": {
"coverlet.collector": {
"type": "Direct",
Expand Down Expand Up @@ -775,10 +764,7 @@
"Microsoft.TestPlatform.ObjectModel": {
"type": "Transitive",
"resolved": "17.13.0",
"contentHash": "bt0E0Dx+iqW97o4A59RCmUmz/5NarJ7LRL+jXbSHod72ibL5XdNm1Ke+UO5tFhBG4VwHLcSjqq9BUSblGNWamw==",
"dependencies": {
"System.Reflection.Metadata": "1.6.0"
}
"contentHash": "bt0E0Dx+iqW97o4A59RCmUmz/5NarJ7LRL+jXbSHod72ibL5XdNm1Ke+UO5tFhBG4VwHLcSjqq9BUSblGNWamw=="
},
"Microsoft.TestPlatform.TestHost": {
"type": "Transitive",
Expand All @@ -799,11 +785,6 @@
"resolved": "1.2.0.556",
"contentHash": "zvn9Mqs/ox/83cpYPignI8hJEM2A93s2HkHs8HYMOAQW0PkampyoErAiIyKxgTLqbbad29HX/shv/6LGSjPJNQ=="
},
"System.Reflection.Metadata": {
"type": "Transitive",
"resolved": "1.6.0",
"contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
},
"xunit.analyzers": {
"type": "Transitive",
"resolved": "1.21.0",
Expand Down Expand Up @@ -863,6 +844,7 @@
"type": "Project"
}
},
"net8.0/win-x86": {},
"net9.0": {
"coverlet.collector": {
"type": "Direct",
Expand Down Expand Up @@ -964,10 +946,7 @@
"Microsoft.TestPlatform.ObjectModel": {
"type": "Transitive",
"resolved": "17.13.0",
"contentHash": "bt0E0Dx+iqW97o4A59RCmUmz/5NarJ7LRL+jXbSHod72ibL5XdNm1Ke+UO5tFhBG4VwHLcSjqq9BUSblGNWamw==",
"dependencies": {
"System.Reflection.Metadata": "1.6.0"
}
"contentHash": "bt0E0Dx+iqW97o4A59RCmUmz/5NarJ7LRL+jXbSHod72ibL5XdNm1Ke+UO5tFhBG4VwHLcSjqq9BUSblGNWamw=="
},
"Microsoft.TestPlatform.TestHost": {
"type": "Transitive",
Expand All @@ -988,11 +967,6 @@
"resolved": "1.2.0.556",
"contentHash": "zvn9Mqs/ox/83cpYPignI8hJEM2A93s2HkHs8HYMOAQW0PkampyoErAiIyKxgTLqbbad29HX/shv/6LGSjPJNQ=="
},
"System.Reflection.Metadata": {
"type": "Transitive",
"resolved": "1.6.0",
"contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
},
"xunit.analyzers": {
"type": "Transitive",
"resolved": "1.21.0",
Expand Down Expand Up @@ -1051,6 +1025,7 @@
"netduid": {
"type": "Project"
}
}
},
"net9.0/win-x86": {}
}
}
4 changes: 2 additions & 2 deletions src/NetDuid/NetDuid.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<Target Name="Husky" BeforeTargets="Restore;CollectPackageReferences" Condition="'$(HUSKY)' != 0">
<Exec Command="dotnet tool restore" StandardOutputImportance="Low" StandardErrorImportance="High" />
<Target Name="Husky" BeforeTargets="Restore;CollectPackageReferences" Condition="'$(HUSKY)' != 0 and '$(GITHUB_ACTIONS)' != 'true' and '$(TF_BUILD)' != 'true'">
<Exec Command="dotnet tool restore" StandardOutputImportance="Low" StandardErrorImportance="High" WorkingDirectory="..\\.." />
<Exec
Command="dotnet husky install"
StandardOutputImportance="Low"
Expand Down
2 changes: 1 addition & 1 deletion src/global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.101",
"version": "9.0.304",
"rollForward": "latestFeature"
}
}
Loading