Skip to content

Commit

Permalink
Update main with changes from release/2.7 (#1494)
Browse files Browse the repository at this point in the history
* fix(archicad): self contained proj

* Archicad/dotnet5 (#1479)

* ci: do not create pre-release channels

* ci

Co-authored-by: Matteo Cominetti <[email protected]>
  • Loading branch information
AlanRynne and teocomi authored Aug 9, 2022
1 parent 26ba7be commit 3a56caf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 1 addition & 2 deletions .circleci/scripts/config-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,9 @@ jobs: # Each project will have individual jobs for each specific task it has to
$tag = if([string]::IsNullOrEmpty($env:CIRCLE_TAG)) { "0.0.0" } else { $env:CIRCLE_TAG }
$semver = if($tag.Contains('/')) {$tag.Split("/")[0] } else { $tag }
$ver = if($semver.Contains('-')) {$semver.Split("-")[0] } else { $semver }
$channel = if($semver.Contains('-')) {$semver.Split("-")[1] } else { "latest" }
$version = "$($ver).$($env:WORKFLOW_NUM)"
msbuild << parameters.slnname >>/<< parameters.slnname >>.sln /p:Configuration=Release /p:WarningLevel=0 /p:IsDesktopBuild=false /p:AssemblyVersionNumber=$version /p:AssemblyInformationalVersion=$semver /p:Version=$semver
if(-Not [string]::IsNullOrEmpty($env:CIRCLE_TAG)) { New-Item -Force "speckle-sharp-ci-tools/Installers/<< parameters.slug >>/$channel.yml" -ItemType File -Value "version: $semver" }
if(-Not [string]::IsNullOrEmpty($env:CIRCLE_TAG) -And -Not $semver.Contains('-')) { New-Item -Force "speckle-sharp-ci-tools/Installers/<< parameters.slug >>/latest.yml" -ItemType File -Value "version: $semver" }
environment:
WORKFLOW_NUM: << pipeline.number >>

Expand Down
4 changes: 4 additions & 0 deletions ConnectorArchicad/ConnectorArchicad/ConnectorArchicad.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<Nullable>enable</Nullable>
<SelfContained>true</SelfContained>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<Company>Speckle</Company>
<Product>ArchiCAD Connector</Product>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
Expand Down

0 comments on commit 3a56caf

Please sign in to comment.