Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dui3/alpha' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
JR-Morgan committed Jul 8, 2024
2 parents 84bdb4f + 34e16b7 commit e4ce43e
Show file tree
Hide file tree
Showing 621 changed files with 39,513 additions and 163 deletions.
2 changes: 1 addition & 1 deletion .circleci/scripts/config-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ jobs: # Each project will have individual jobs for each specific task it has to

build-connector-dotnet-mac:
docker:
- image: mcr.microsoft.com/dotnet/sdk:7.0
- image: mcr.microsoft.com/dotnet/sdk:8.0.204
parameters:
slnname:
type: string
Expand Down
22 changes: 11 additions & 11 deletions .circleci/scripts/parameters.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"core": true,
"rhino": true,
"revit": true,
"dynamo": true,
"csi": true,
"autocadcivil": true,
"bentley": true,
"archicad": true,
"teklastructures": true,
"navisworks": true
}
"core": true,
"rhino": true,
"revit": true,
"dynamo": true,
"csi": true,
"autocadcivil": true,
"bentley": true,
"archicad": true,
"teklastructures": true,
"navisworks": true
}
24 changes: 8 additions & 16 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,19 @@
"tools": {
"dotnet-t4": {
"version": "2.2.1",
"commands": [
"t4"
]
},
"jetbrains.resharper.globaltools": {
"version": "2023.1.0",
"commands": [
"jb"
]
"commands": ["t4"]
},
"csharpier": {
"version": "0.23.0",
"commands": [
"dotnet-csharpier"
]
"commands": ["dotnet-csharpier"]
},
"husky": {
"version": "0.5.4",
"commands": [
"husky"
]
"commands": ["husky"]
},
"gitversion.tool": {
"version": "5.12.0",
"commands": ["dotnet-gitversion"]
}
}
}
}
5 changes: 5 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,8 @@ dotnet_diagnostic.ide0078.severity = suggestion # Use pattern matching: Subjecti
dotnet_diagnostic.ide0260.severity = suggestion # Use pattern matching: Subjective
dotnet_diagnostic.ide0022.severity = suggestion # Use expression body for method: Subjective
dotnet_diagnostic.ide0061.severity = suggestion # Use expression body for local functions: Subjective
dotnet_diagnostic.ide0063.severity = suggestion # Using directive can be simplified
dotnet_diagnostic.ide0066.severity = suggestion # Use switch expression: Subjective
dotnet_diagnostic.ide0029.severity = suggestion # Null check can be simplified: Subjective
dotnet_diagnostic.ide0030.severity = suggestion # Null check can be simplified: Subjective
dotnet_diagnostic.ide0270.severity = suggestion # Null check can be simplified: Subjective
Expand All @@ -229,6 +231,7 @@ dotnet_diagnostic.ide0030.severity = suggestion # Null check can be simplified:
dotnet_diagnostic.ide0270.severity = suggestion # Null check can be simplified: Subjective
dotnet_diagnostic.ide0042.severity = suggestion # Deconstruct variable declaration: Subjective
dotnet_diagnostic.ide0028.severity = suggestion # Use collection initializers: Subjective
dotnet_diagnostic.ide0072.severity = suggestion # Populate switch statement: Subjective
dotnet_diagnostic.ide0074.severity = suggestion # Use compound assignment: Subjective

# Maintainability rules
Expand All @@ -239,6 +242,8 @@ dotnet_diagnostic.ca1506.severity = warning # Avoid excessive class coupling
dotnet_diagnostic.ca1507.severity = warning # Use nameof in place of string
dotnet_diagnostic.ca1508.severity = warning # Avoid dead conditional code
dotnet_diagnostic.ca1509.severity = warning # Invalid entry in code metrics configuration file
dotnet_diagnostic.CA2254.severity = none # Template should be a static expression



# Performance rules
Expand Down
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions" # search for actions - there are other options available
directory: "/" # search in .github/workflows under root `/`
schedule:
interval: "weekly" # check for action update every week
52 changes: 52 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: .NET Build

on:
pull_request: # Run build on every pull request that is not to main/dev
branches-ignore:
- main
- dev
workflow_call:
outputs:
version:
value: ${{ jobs.build.outputs.version }}

jobs:
build:
runs-on: windows-latest
outputs:
version: ${{ steps.set-version.outputs.version }}
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.2xx # Align with global.json (including roll forward rules)

- name: Cache Nuget
uses: actions/cache@v4
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: |
${{ runner.os }}-nuget-
- name: ⚒️ Run GitVersion
run: ./build.ps1 build-server-version

- name: ⚒️ Run build
run: ./build.ps1

- name: ⬆️ Upload artifacts
uses: actions/upload-artifact@v4
with:
name: output-${{ env.GitVersion_FullSemVer }}
path: output/*.*
compression-level: 0 # no compression

- id: set-version
name: Set version to output
run: echo "version=${{ env.GitVersion_FullSemVer }}" >> "$GITHUB_OUTPUT"
30 changes: 30 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: .NET Build and Publish

on:
push:
branches: ["main", "dev", "dui3/alpha"] # Continuous delivery on every long-lived branch
tags: ["3.*"] # Manual delivery on every 3.x tag
pull_request:
branches: ["main", "dev"] # Releases on every PR that targets main or dev

jobs:
build:
uses: ./.github/workflows/ci.yml

# deploy-installers:
# runs-on: ubuntu-latest
# needs: build
# steps:
# - name: 🔫 Trigger Build Installers
# uses: ALEEF02/[email protected]
# with:
# workflow: Build Installers
# repo: specklesystems/connector-installers
# token: ${{ secrets.CONNECTORS_GH_TOKEN }}
# inputs: '{ "run_id": "${{ github.run_id }}", "version": "${{ needs.build.outputs.version }}" }'
# ref: main
# wait-for-completion: true
# wait-for-completion-interval: 10s
# wait-for-completion-timeout: 10m
# display-workflow-run-url: true
# display-workflow-run-url-interval: 10s
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,9 @@ ASALocalRun/
# MSBuild Binary and Structured Log
*.binlog

# random logs
log*.txt

# NVidia Nsight GPU debugger configuration file
*.nvuser

Expand Down Expand Up @@ -377,3 +380,7 @@ ConnectorNavisworks/ConnectorNavisworks/Sample Models
ConnectorArchicad/AddOn/Build*
**/dist/


**/yarn.lock

output/
Loading

0 comments on commit e4ce43e

Please sign in to comment.