diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3a1098c..4edd9dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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!" diff --git a/pipeline.yml b/pipeline.yml index f2776a3..9f5a86a 100644 --- a/pipeline.yml +++ b/pipeline.yml @@ -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 @@ -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" diff --git a/src/GregClient/GregClient.csproj b/src/GregClient/GregClient.csproj index 7f8786f..9144cf5 100644 --- a/src/GregClient/GregClient.csproj +++ b/src/GregClient/GregClient.csproj @@ -11,7 +11,7 @@ Properties Greg Greg - net8.0 + net10.0 $([System.DateTime]::op_Subtraction($([System.DateTime]::get_Now().get_Date()),$([System.DateTime]::new(2023,1,1))).get_TotalDays()) $([MSBuild]::Multiply($(TotalDays), 10)) $([MSBuild]::Divide($([System.DateTime]::get_Now().get_TimeOfDay().get_TotalHours()), 3)) diff --git a/src/GregClientTests/GregClientTests.csproj b/src/GregClientTests/GregClientTests.csproj index 3809c88..2a90568 100644 --- a/src/GregClientTests/GregClientTests.csproj +++ b/src/GregClientTests/GregClientTests.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 enable enable