Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
with:
dotnet-version: '8.0.x'
dotnet-version: "10.0.x"
- name: Build
run: |
dotnet build --configuration Release PackageManagerClient\src\GregClient.sln
- name: Look for PackageManagerClient
run: |
if (Test-Path -Path "${{ github.workspace }}\PackageManagerClient\bin\Release\net8.0\Greg.dll") {
if (Test-Path -Path "${{ github.workspace }}\PackageManagerClient\bin\Release\net10.0\Greg.dll") {
Write-Output "PackageManagerClient exists!"
} else {
Write-Error "PackageManagerClient was not found!"
Expand Down
38 changes: 16 additions & 22 deletions pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,22 @@ schedule:
cron_schedule: "once_a_week"

jenkins_creds:
-
type: secretText
credentialsId: dynamovisualprogramming_nuget_api_key
secretText: APIKEY
-
type: usernamePassword
credentialsId: local-svc_p_ors
username: GITADSK_USERNAME
password: GITADSK_PASSWORD
- type: secretText
credentialsId: dynamovisualprogramming_nuget_api_key
secretText: APIKEY
- type: usernamePassword
credentialsId: local-svc_p_ors
username: GITADSK_USERNAME
password: GITADSK_PASSWORD

build:
-
setup_proj_deps: true
- setup_proj_deps: true
solution: src\\GregClient.sln
scripts:
- "dotnet build --configuration Release src/GregClient.sln"
ci_test:
tests:
-
scripts:
- scripts:
- dotnet coverage collect "dotnet test --no-build --configuration Release src/GregClient.sln --logger:junit --logger:trx" -f xml -o "coverage.xml"

test_report_dir: src\\GregClientTests\\TestResults
Expand All @@ -54,14 +50,12 @@ soc2:
harmony:
hidden_email_list: dynamo_ws_access
third_party_lib_paths:
- bin\Release\net8.0
- bin\Release\net10.0

deployment:
-
type: sign
files_to_sign:
- "bin\\Release\\net8.0\\greg.dll"
-
type: customized
scripts:
- "pwsh.exe -ExecutionPolicy ByPass -File .\\cicdscripts\\PublishPackage.ps1 -ReleaseBranches master"
- type: sign
files_to_sign:
- "bin\\Release\\net10.0\\greg.dll"
- type: customized
scripts:
- "pwsh.exe -ExecutionPolicy ByPass -File .\\cicdscripts\\PublishPackage.ps1 -ReleaseBranches master"
2 changes: 1 addition & 1 deletion src/GregClient/GregClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Greg</RootNamespace>
<AssemblyName>Greg</AssemblyName>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<TotalDays>$([System.DateTime]::op_Subtraction($([System.DateTime]::get_Now().get_Date()),$([System.DateTime]::new(2023,1,1))).get_TotalDays())</TotalDays>
<Days>$([MSBuild]::Multiply($(TotalDays), 10))</Days>
<Hours>$([MSBuild]::Divide($([System.DateTime]::get_Now().get_TimeOfDay().get_TotalHours()), 3))</Hours>
Expand Down
2 changes: 1 addition & 1 deletion src/GregClientTests/GregClientTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down
Loading