Skip to content

Commit

Permalink
Update build system
Browse files Browse the repository at this point in the history
  • Loading branch information
jbtule committed Nov 16, 2024
1 parent 8915fd8 commit 524a3db
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 19 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
dotnet: [ '6.0.x' ]
os: [ubuntu-latest, windows-latest, macOS-latest]
dotnet: [ '8.0.x' ]
os: [ubuntu-latest, macOS-latest]

steps:
- uses: actions/checkout@v1
Expand All @@ -20,4 +20,4 @@ jobs:
- name: Build with dotnet core
run: dotnet build --configuration Release
- name: Tests
run: dotnet test Tests/UnitTestImpromptuInterface/UnitTestImpromptuInterface.csproj --configuration Release --no-build --no-restore --filter=TestCategory!=Performance
run: dotnet test DotNetDBF.Test/DotNetDBF.Test.csproj --configuration Release --no-build --no-restore
30 changes: 15 additions & 15 deletions .github/workflows/dotnet48.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
name: Build CrossComple .net core/.net framework Windows
name: .net framework Windows

on: [push]

jobs:
build:
name: Test Windows .net Framework Only
runs-on: windows-2019
runs-on: windows-2022
steps:

- uses: actions/checkout@v2

- name: Setup NuGet
uses: NuGet/[email protected]

- name: setup-msbuild
uses: microsoft/[email protected]

- name: Restore Packages
- uses: actions/checkout@v4
- uses: NuGet/setup-nuget@v2
- uses: microsoft/setup-msbuild@v2
with:
dotnet-version: 4.7.2

- name: Restore
run: nuget restore ImpromptuInterface.sln
- name: Build solution
- name: Build
run: msbuild ImpromptuInterface.sln -t:rebuild -property:Configuration=Release
- name: Run vstests
uses: microsoft/vstest-action@v1.0.0
- name: Test
uses: josepho0918/vstest-action@0e887de8dcfab5ce3eecaf4ad6320bb9b3ecf633
with:
testAssembly: UnitTestImpromptuInterface.dll
searchFolder: .\Tests\UnitTestImpromptuInterface\bin\Release\*\
runInParallel: true
otherConsoleOptions: /TestCaseFilter:"(TestCategory!=Performance)"
platform: x64
- name: Publish
run:
dotnet nuget push '${{ github.workspace }}\publish\*.nupkg' --source https://nuget.pkg.github.com/ekonbenefits/index.json --api-key ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions ImpromptuInterface.sln
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{87291621-4395-4EFE-A070-9A007B26EF6D}"
ProjectSection(SolutionItems) = preProject
Version.props = Version.props
Readme.md = Readme.md
EndProjectSection
EndProject
Global
Expand Down
6 changes: 6 additions & 0 deletions ImpromptuInterface/ImpromptuInterface.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,10 @@
<PackageReference Include="System.Reflection.Emit" Version="4.*" />
<PackageReference Include="Microsoft.CSharp" Version="4.*" />
</ItemGroup>
<Target Name="CopyPackage" AfterTargets="Pack">
<Copy
SourceFiles="$(OutputPath)$(PackageId).$(PackageVersion).nupkg"
DestinationFolder="$(SolutionDir)\publish"
/>
</Target>
</Project>
2 changes: 1 addition & 1 deletion Version.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<PropertyGroup>
<VersionPrefix>8.0.4</VersionPrefix>
<VersionPrefix>8.0.5</VersionPrefix>
</PropertyGroup>
</Project>

0 comments on commit 524a3db

Please sign in to comment.