From 3c8673815fba201f5bca087b9bea453b13f64147 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 20 Jan 2022 20:50:55 -0800 Subject: [PATCH] fix: adding nano project to jacdac.sln (#12) * adding nano project to jacdac.sln * add nano github action * force v1.2 * nanobuild v1.3 * remove msbuild clean * always use rebuild * detailled build * typo * nanobuild v1.4 * x64 msbuild * unlock task * don't just build nano --- .github/workflows/build.yml | 8 +++++--- Jacdac.sln | 24 ++++++++++++++++++++++++ pack.sh | 8 ++++---- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d6f1875..315b821 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,10 +9,12 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-dotnet@v1 - uses: microsoft/setup-msbuild@v1.1 - - run: msbuild.exe -t:clean Jacdac.sln + with: + msbuild-architecture: x64 + - uses: nanoframework/nanobuild@v1 - run: nuget restore Jacdac.sln -PackagesDirectory ./packages - - run: msbuild.exe -t:build -p:Configuration=Debug Jacdac.sln - - run: msbuild.exe -t:build -p:Configuration=Release Jacdac.sln + - run: msbuild.exe -t:rebuild -p:Configuration=Debug Jacdac.sln + - run: msbuild.exe -t:rebuild -p:Configuration=Release Jacdac.sln - name: Run tests run: dotnet test .\Jacdac.Tests\Jacdac.Tests.csproj - name: Semantic release diff --git a/Jacdac.sln b/Jacdac.sln index d62cde0..45664f5 100644 --- a/Jacdac.sln +++ b/Jacdac.sln @@ -54,6 +54,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jacdac.NET.Servers.AzureIot EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jacdac.NET.Transports.LibUsb", "Jacdac.NET.Transports.LibUsb\Jacdac.NET.Transports.LibUsb.csproj", "{BF58996A-78E1-4CD5-AC5D-A81D7BDC4CCE}" EndProject +Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Jacdac.Nano", "Jacdac.Nano\Jacdac.Nano.nfproj", "{071C8FF7-00A1-4C77-9192-146C24327E8B}" +EndProject +Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Jacdac.Nano.Clients", "Jacdac.Nano.Clients\Jacdac.Nano.Clients.nfproj", "{3807D02E-87C6-4A3D-85DD-FA3ADB573A5C}" +EndProject +Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Jacdac.Nano.Transports.Spi", "Jacdac.Nano.Transports.Spi\Jacdac.Nano.Transports.Spi.nfproj", "{7D0D9C8B-9E8F-475A-B32C-9038C714A19B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -130,6 +136,24 @@ Global {BF58996A-78E1-4CD5-AC5D-A81D7BDC4CCE}.Debug|Any CPU.Build.0 = Debug|Any CPU {BF58996A-78E1-4CD5-AC5D-A81D7BDC4CCE}.Release|Any CPU.ActiveCfg = Release|Any CPU {BF58996A-78E1-4CD5-AC5D-A81D7BDC4CCE}.Release|Any CPU.Build.0 = Release|Any CPU + {071C8FF7-00A1-4C77-9192-146C24327E8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {071C8FF7-00A1-4C77-9192-146C24327E8B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {071C8FF7-00A1-4C77-9192-146C24327E8B}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {071C8FF7-00A1-4C77-9192-146C24327E8B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {071C8FF7-00A1-4C77-9192-146C24327E8B}.Release|Any CPU.Build.0 = Release|Any CPU + {071C8FF7-00A1-4C77-9192-146C24327E8B}.Release|Any CPU.Deploy.0 = Release|Any CPU + {3807D02E-87C6-4A3D-85DD-FA3ADB573A5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3807D02E-87C6-4A3D-85DD-FA3ADB573A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3807D02E-87C6-4A3D-85DD-FA3ADB573A5C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {3807D02E-87C6-4A3D-85DD-FA3ADB573A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3807D02E-87C6-4A3D-85DD-FA3ADB573A5C}.Release|Any CPU.Build.0 = Release|Any CPU + {3807D02E-87C6-4A3D-85DD-FA3ADB573A5C}.Release|Any CPU.Deploy.0 = Release|Any CPU + {7D0D9C8B-9E8F-475A-B32C-9038C714A19B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7D0D9C8B-9E8F-475A-B32C-9038C714A19B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7D0D9C8B-9E8F-475A-B32C-9038C714A19B}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {7D0D9C8B-9E8F-475A-B32C-9038C714A19B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7D0D9C8B-9E8F-475A-B32C-9038C714A19B}.Release|Any CPU.Build.0 = Release|Any CPU + {7D0D9C8B-9E8F-475A-B32C-9038C714A19B}.Release|Any CPU.Deploy.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/pack.sh b/pack.sh index 9c03fca..127cb6c 100644 --- a/pack.sh +++ b/pack.sh @@ -7,24 +7,24 @@ nuget restore Jacdac.sln -PackagesDirectory ./packages # Jacdac.TinyCLR cd Jacdac.TinyCLR -msbuild.exe -t:build -p:Configuration=Release Jacdac.TinyCLR.csproj +msbuild.exe -t:rebuild -p:Configuration=Release Jacdac.TinyCLR.csproj nuget.exe pack Jacdac.TinyCLR.csproj -Prop Configuration=Release -OutputDirectory ../newpackages -PackagesDirectory ../packages cd .. # Jacdac.TinyCLR.Clients cd Jacdac.TinyCLR.Clients -msbuild.exe -t:build -p:Configuration=Release Jacdac.TinyCLR.Clients.csproj +msbuild.exe -t:rebuild -p:Configuration=Release Jacdac.TinyCLR.Clients.csproj nuget.exe pack Jacdac.TinyCLR.Clients.csproj -Prop Configuration=Release -OutputDirectory ../newpackages -PackagesDirectory ../packages cd .. # Jacdac.TinyCLR.Storage cd Jacdac.TinyCLR.Storage -msbuild.exe -t:build -p:Configuration=Release Jacdac.TinyCLR.Storage.csproj +msbuild.exe -t:rebuild -p:Configuration=Release Jacdac.TinyCLR.Storage.csproj nuget.exe pack Jacdac.TinyCLR.Storage.csproj -Prop Configuration=Release -OutputDirectory ../newpackages -PackagesDirectory ../packages cd .. # .NET assemblies -msbuild.exe -t:build -p:Configuration=Release Jacdac.sln +msbuild.exe -t:rebuild -p:Configuration=Release Jacdac.sln dotnet pack Jacdac.DevTools/Jacdac.DevTools.csproj -c Release -o newpackages dotnet pack Jacdac.NET/Jacdac.NET.csproj -c Release -o newpackages dotnet pack Jacdac.NET.Clients/Jacdac.NET.Clients.csproj -c Release -o newpackages