From 5e0cace8ace6b4dc7e665e1473c2707d1fb4da40 Mon Sep 17 00:00:00 2001 From: Daniel Collingwood <82693586+danzuep@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:05:31 +0800 Subject: [PATCH] removed commented-out code --- .github/workflows/_publish.yml | 39 +----------------------------- .github/workflows/_version.yml | 15 +----------- LocalGuideAI/LocalGuideAI.csproj | 41 +++++++++++--------------------- Scripts/publish.ps1 | 10 -------- 4 files changed, 16 insertions(+), 89 deletions(-) diff --git a/.github/workflows/_publish.yml b/.github/workflows/_publish.yml index 77722ab..6ae87b4 100644 --- a/.github/workflows/_publish.yml +++ b/.github/workflows/_publish.yml @@ -28,11 +28,6 @@ on: env: DotNetVersion: 8.0.x DotNetTarget: net8.0 - # https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json - SourceLink: https://aka.ms/dotnet8/nuget/index.json - # https://maui.blob.core.windows.net/metadata/rollbacks/net8.0.json - RollbackLink: https://aka.ms/dotnet/maui/net8.0.json - NuGetLink: https://api.nuget.org/v3/index.json jobs: deploy: @@ -60,44 +55,12 @@ jobs: echo "Project Name: ${{ inputs.projectName }}"; dotnet workload install maui-android; dotnet workload list; - # dotnet nuget locals all --clear; - # dotnet workload restore; - # dotnet workload install maui maui-android maui-ios; - # dotnet workload install maui android ios maccatalyst tvos macos wasm-tools ${{ env.PackageLinks }} - env: - PackageLinks: "--from-rollback-file ${{env.RollbackLink}} --source ${{env.SourceLink}} --source ${{env.NuGetLink}}" - - # - name: Create signing pfx file from secrets - # shell: pwsh - # id: secret-file - # env: - # SECRET_DATA1: ${{ secrets.WIN_SIGN_CERT }} - # run: | - # $secretFile = "XamCATFidCert.pfx"; - # $encodedBytes = [System.Convert]::FromBase64String($env:SECRET_DATA1); - # Set-Content $secretFile -Value $encodedBytes -AsByteStream; - # Write-Output "SECRET_FILE=${secretFile}" | Out-File -FilePath $env:GITHUB_ENV -Append - # if (-Not (Test-Path -Path "${kestorePath}" -PathType Leaf)) { - # throw "The file '${kestorePath}' was not found." - # } - - # - name: Pack Windows App - # shell: pwsh - # run: | - # & "C:\Program Files (x86)\Windows Kits\10\App Certification Kit\MakeAppx" pack /v /h SHA256 /d "" /p .msix - # & ls - - # - name: Sign Windows App - # shell: pwsh - # env: - # CERT_PASSWORD: ${{ secrets.WIN_CERT_PASSWORD }} - # run: | - # & "C:\Program Files (x86)\Windows Kits\10\App Certification Kit\SignTool" sign /a /fd SHA256 /f XamCATFidCert.pfx /p $WIN_CERT_PASSWORD .msix - name: Publish Android package run: | echo "Project File: $projectFile"; echo "Project Version: $buildVersion"; + echo "Target Framework: $targetFramework"; dotnet publish $projectFile -c $configuration -f $targetFramework /p:Version=$buildVersion /p:AndroidPackageFormats=$androidPackageFormats -o $publishOutputFolder --nologo; env: projectFile: '${{ inputs.projectFile }}' diff --git a/.github/workflows/_version.yml b/.github/workflows/_version.yml index 0f0c048..cf72dbe 100644 --- a/.github/workflows/_version.yml +++ b/.github/workflows/_version.yml @@ -57,18 +57,6 @@ jobs: echo "## $projectName" > release-notes.txt git log --pretty=format:"- %s" >> release-notes.txt - # # TODO: fix this - # - run: | - # echo "Generate release notes from the Git commit log." - # last_tag=$(git describe --abbrev=0 --tags 2>/dev/null) - # if [[ -z "$last_tag" ]]; then - # echo "## $projectName" > release-notes.txt - # git log --pretty=format:"- %s" >> release-notes.txt - # else - # echo "## $projectName changes since $last_tag" > release-notes.txt - # git log --pretty=format:"- %s" --since="$last_tag" >> release-notes.txt - # fi - # https://github.com/GitTools/actions/blob/main/docs/examples/github/gitversion/setup/usage-examples.md#example-1 - name: Set up GitVersion uses: gittools/actions/gitversion/setup@v0 @@ -77,9 +65,8 @@ jobs: # https://github.com/GitTools/actions/blob/main/docs/examples/github/gitversion/execute/usage-examples.md#example-5 # For a list of all GitVersion Version Variables, see https://gitversion.net/docs/reference/variables - # pwsh> dotnet-gitversion | ConvertFrom-Json - name: Use GitVersion to determine version - id: gitversion # e.g. steps.gitversion.outputs. + id: gitversion uses: gittools/actions/gitversion/execute@v0 - run: | diff --git a/LocalGuideAI/LocalGuideAI.csproj b/LocalGuideAI/LocalGuideAI.csproj index 411f4ae..6b120a6 100644 --- a/LocalGuideAI/LocalGuideAI.csproj +++ b/LocalGuideAI/LocalGuideAI.csproj @@ -1,8 +1,8 @@  - net8.0-android - $(TargetFrameworks);net8.0-ios;net8.0-macios + net8.0-android + $(TargetFrameworks);net8.0-ios;net8.0-macios $(TargetFrameworks);net8.0-windows10.0.19041.0 @@ -31,9 +31,9 @@ 1.0 1 - - True - + + True + 11.0 13.1 21.0 @@ -81,40 +81,27 @@ - - - + + + - - + + - - <_Parameter1>$(MSBuildProjectName).Tests - + + <_Parameter1>$(MSBuildProjectName).Tests + - + - - - - - - - - SettingsPage.xaml - - - - - diff --git a/Scripts/publish.ps1 b/Scripts/publish.ps1 index 9ff3eca..162ce56 100644 --- a/Scripts/publish.ps1 +++ b/Scripts/publish.ps1 @@ -13,15 +13,6 @@ $projectName = $projectDirectory.BaseName; $projectAppName = "${projectName}"; $projectFile="${projectFolder}/${projectAppName}/${projectAppName}.csproj"; -# #$dotnetVersion="8.0.x"; -# $NuGetLink="https://api.nuget.org/v3/index.json" -# # https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json -# $SourceLink="https://aka.ms/dotnet8/nuget/index.json" -# # https://maui.blob.core.windows.net/metadata/rollbacks/net8.0.json -# $RollbackLink="https://aka.ms/dotnet/maui/net8.0.json" -# $PackageLinks="--from-rollback-file ${RollbackLink} --source ${SourceLink} --source ${NuGetLink}" -# dotnet workload install maui android ${PackageLinks} - # restore the base project dependencies Set-Location -Path "${projectFolder}"; dotnet restore "${projectFile}"; @@ -53,7 +44,6 @@ Write-Host "Local .NET Version: "; dotnet --version; Write-Host "Target Framework: ${targetFramework}"; Write-Host "Project File: ${projectFile} (version ${buildVersion})"; -# dotnet publish "${projectFile}" -c $configuration --framework $targetFramework /p:Version=$buildVersion /p:AndroidPackageFormats=$androidPackageFormats -o "${publishOutputFolder}" --no-restore --nologo; dotnet publish "${projectFile}" -c $configuration --framework $targetFramework /p:Version=$buildVersion /p:AndroidPackageFormats=$androidPackageFormats /p:AndroidKeyStore=true /p:AndroidSigningKeyStore="${kestorePath}" /p:AndroidSigningKeyAlias="${androidSigningAlias}" /p:AndroidSigningKeyPass="${Env:AndroidSigningPassword}" /p:AndroidSigningStorePass="${Env:AndroidSigningPassword}" -o "${publishOutputFolder}" --no-restore --nologo; if (-not $?) { Write-Host "Project failed to publish.";