Merge branch 'feat/refactor+ci' into main

This commit is contained in:
Alan Rynne
2020-12-07 17:47:51 +01:00
3 changed files with 19 additions and 14 deletions
+18 -3
View File
@@ -4,9 +4,9 @@ orbs:
win: circleci/windows@2.2.0
jobs:
build:
build-and-publish:
executor: win/default
steps:
- checkout
- run:
@@ -17,6 +17,21 @@ jobs:
command: msbuild GrasshopperAsyncComponent.sln /p:Configuration=Release
- run:
name: Pack NuGet
command: nuget pack GrasshopperAsyncComponent/GrasshopperAsyncComponent.csproj
command: cd GrasshopperAsyncComponent; nuget pack GrasshopperAsyncComponent.csproj -Prop Configuration=Release
- run:
name: Pack NuGet
command: nuget push ${NUGET_AUTH_TOKEN} -Source https://api.nuget.org/v3/index.json *.nupkg
workflows:
publish:
jobs:
- build-and-publish:
filters:
tags:
only: /^v.*/
branches:
ignore: /.*/
@@ -2,7 +2,7 @@
<package >
<metadata>
<id>GrasshopperAsyncComponent</id>
<version>1.0.0.0</version>
<version>0.1.0.0</version>
<title>GrasshopperAsyncComponent</title>
<authors>Speckle Systems</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -57,7 +57,6 @@
<ItemGroup>
<PackageReference Include="Grasshopper" Version="6.31.20315.17001" />
<PackageReference Include="RhinoCommon" Version="6.31.20315.17001" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\GrasshopperAsyncComponent\GrasshopperAsyncComponent.csproj">
@@ -97,13 +96,4 @@
</StartArguments>
<StartAction>Program</StartAction>
</PropertyGroup>
<Import Project="packages\RhinoCommon.6.29.20238.11501\build\net45\RhinoCommon.targets" Condition="Exists('packages\RhinoCommon.6.29.20238.11501\build\net45\RhinoCommon.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('packages\RhinoCommon.6.29.20238.11501\build\net45\RhinoCommon.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\RhinoCommon.6.29.20238.11501\build\net45\RhinoCommon.targets'))" />
<Error Condition="!Exists('packages\Grasshopper.6.29.20238.11501\build\net45\Grasshopper.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Grasshopper.6.29.20238.11501\build\net45\Grasshopper.targets'))" />
</Target>
<Import Project="packages\Grasshopper.6.29.20238.11501\build\net45\Grasshopper.targets" Condition="Exists('packages\Grasshopper.6.29.20238.11501\build\net45\Grasshopper.targets')" />
</Project>