diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1864e844..1e1bce85 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -79,7 +79,7 @@ jobs: shell: pwsh run: | dotnet build src/avalonia/kv.sln; - dotnet build src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio.slnx + dotnet build src/uno/AzureKeyVaultStudio.slnx - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/uno-dotnet.yml b/.github/workflows/uno-dotnet.yml index 43622b06..92afde1b 100644 --- a/.github/workflows/uno-dotnet.yml +++ b/.github/workflows/uno-dotnet.yml @@ -19,6 +19,8 @@ env: STEP_TIMEOUT_MINUTES: 60 CONFIGURATION: Release dotnetVersion: 10.0.x + APP_VERSION_NUMBER: 2.1.${{ github.run_number }} + jobs: build_windows_x64: name: Build Windows x64 @@ -38,8 +40,8 @@ jobs: - name: Publish Windows x64 shell: pwsh run: | - cd ./src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio - dotnet publish -f net10.0-windows10.0.26100 -r win-x64 -p:SelfContained=true -p:PublishSingleFile=true -p:PublishReadyToRun=true -p:Version=2.0.${{ github.run_number }} -c Release -p:WindowsPackageType=None ./AzureKeyVaultStudio.csproj + cd ./src/uno/AzureKeyVaultStudio + dotnet publish -f net10.0-windows10.0.26100 -r win-x64 -p:SelfContained=true -p:PublishSingleFile=true -p:PublishReadyToRun=true -p:Version=${{ env.APP_VERSION_NUMBER }} -c Release -p:WindowsPackageType=None ./AzureKeyVaultStudio.csproj New-Item -ItemType Directory -Path "$env:GITHUB_WORKSPACE/win-x64" -Force Move-Item -Path ".\bin\Release\net10.0-windows10.0.26100\win-x64\publish\*.exe" -Destination "$env:GITHUB_WORKSPACE\win-x64\" -Force - name: Create Package @@ -69,8 +71,8 @@ jobs: - name: Publish Windows ARM64 shell: pwsh run: | - cd ./src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio - dotnet publish -f net10.0-windows10.0.26100 -r win-arm64 -p:Platform=arm64 -p:SelfContained=true -p:PublishSingleFile=true -p:PublishReadyToRun=true -p:PublishTrimmed=false -p:Version=2.0.${{ github.run_number }} -c Release -p:WindowsPackageType=None ./AzureKeyVaultStudio.csproj + cd ./src/uno/AzureKeyVaultStudio + dotnet publish -f net10.0-windows10.0.26100 -r win-arm64 -p:Platform=arm64 -p:SelfContained=true -p:PublishSingleFile=true -p:PublishReadyToRun=true -p:PublishTrimmed=false -p:Version=${{ env.APP_VERSION_NUMBER }} -c Release -p:WindowsPackageType=None ./AzureKeyVaultStudio.csproj New-Item -ItemType Directory -Path "$env:GITHUB_WORKSPACE/win-arm64" -Force Move-Item -Path ".\bin\Release\net10.0-windows10.0.26100\win-arm64\publish\*.exe" -Destination "$env:GITHUB_WORKSPACE\win-arm64\" -Force - name: Create Package @@ -101,8 +103,8 @@ jobs: shell: pwsh run: | dotnet workload restore - cd ./src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio - dotnet publish -f net10.0-desktop -p:UnoMacOSCustomInfoPlist=Info.plist -p:PackageFormat=app -p:SelfContained=true -p:PublishReadyToRun=true -r osx-x64 -p:Version=2.0.${{ github.run_number }} -c Release ./AzureKeyVaultStudio.csproj + cd ./src/uno/AzureKeyVaultStudio + dotnet publish -f net10.0-desktop -p:UnoMacOSCustomInfoPlist=Info.plist -p:PackageFormat=app -p:SelfContained=true -p:PublishReadyToRun=true -r osx-x64 -p:Version=${{ env.APP_VERSION_NUMBER }} -c Release ./AzureKeyVaultStudio.csproj New-Item -ItemType Directory -Path "$env:GITHUB_WORKSPACE/osx-x64" -Force Move-Item -Path "./bin/Release/net10.0-desktop/osx-x64/publish/*.app" -Destination "$env:GITHUB_WORKSPACE/osx-x64/" -Force - name: Create Package @@ -132,9 +134,9 @@ jobs: - name: Publish macOS ARM64 shell: pwsh run: | - cd ./src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio + cd ./src/uno/AzureKeyVaultStudio dotnet workload restore - dotnet publish -f net10.0-desktop -p:UnoMacOSCustomInfoPlist=Info.plist -p:PackageFormat=app -p:PublishReadyToRun=true -r osx-arm64 -p:Version=2.0.${{ github.run_number }} -c Release ./AzureKeyVaultStudio.csproj + dotnet publish -f net10.0-desktop -p:UnoMacOSCustomInfoPlist=Info.plist -p:PackageFormat=app -p:PublishReadyToRun=true -r osx-arm64 -p:Version=${{ env.APP_VERSION_NUMBER }} -c Release ./AzureKeyVaultStudio.csproj New-Item -ItemType Directory -Path "$env:GITHUB_WORKSPACE/osx-arm64" -Force Move-Item -Path "./bin/Release/net10.0-desktop/osx-arm64/publish/*.app" -Destination "$env:GITHUB_WORKSPACE/osx-arm64/" -Force - name: Create Package @@ -164,8 +166,8 @@ jobs: - name: Publish Linux x64 shell: pwsh run: | - cd ./src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio - dotnet publish -f net10.0-desktop -r linux-x64 -p:SelfContained=true -p:PublishReadyToRun=true -p:Version=2.0.${{ github.run_number }} -c Release ./AzureKeyVaultStudio.csproj + cd ./src/uno/AzureKeyVaultStudio + dotnet publish -f net10.0-desktop -r linux-x64 -p:SelfContained=true -p:PublishReadyToRun=true -p:Version=${{ env.APP_VERSION_NUMBER }} -c Release ./AzureKeyVaultStudio.csproj New-Item -ItemType Directory -Path "$env:GITHUB_WORKSPACE/linux-x64" -Force Move-Item -Path ".\bin\Release\net10.0-desktop\linux-x64\publish\*" -Destination "$env:GITHUB_WORKSPACE\linux-x64\" -Force - name: Create Package @@ -194,8 +196,8 @@ jobs: run: Get-ChildItem -Recurse - name: Create Release run: | - gh release create v2.0.${{ github.run_number }} --draft --title "AzureKeyVaultStudio v2.0.${{ github.run_number }}" || true - gh release upload v2.0.${{ github.run_number }} "./azurekeyvaultstudio.win-x64.tar/azurekeyvaultstudio.win-x64.tar" "./azurekeyvaultstudio.win-arm64.tar/azurekeyvaultstudio.win-arm64.tar" "./azurekeyvaultstudio.macos-x64.tar/azurekeyvaultstudio.macos-x64.tar" "./azurekeyvaultstudio.macos-arm64.tar/azurekeyvaultstudio.macos-arm64.tar" "./azurekeyvaultstudio.linux-x64.tar/azurekeyvaultstudio.linux-x64.tar" --clobber || true + gh release create v${{ env.APP_VERSION_NUMBER }} --draft --title "Azure Key Vault v${{ env.APP_VERSION_NUMBER }}" || true + gh release upload v${{ env.APP_VERSION_NUMBER }} "./azurekeyvaultstudio.win-x64.tar/azurekeyvaultstudio.win-x64.tar" "./azurekeyvaultstudio.win-arm64.tar/azurekeyvaultstudio.win-arm64.tar" "./azurekeyvaultstudio.macos-x64.tar/azurekeyvaultstudio.macos-x64.tar" "./azurekeyvaultstudio.macos-arm64.tar/azurekeyvaultstudio.macos-arm64.tar" "./azurekeyvaultstudio.linux-x64.tar/azurekeyvaultstudio.linux-x64.tar" --clobber || true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: bash diff --git a/README.md b/README.md index c3b39f71..5c9db4cf 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

- +

Azure Key Vault Explorer @@ -19,11 +19,12 @@ winget install "Key Vault Explorer" --source msstore ``` -### macOS and Linux +### [macOS](#macos) and Linux Download from the [releases page](https://github.com/cricketthomas/AzureKeyVaultExplorer/releases). ![Downloads](https://img.shields.io/github/downloads/cricketthomas/AzureKeyVaultExplorer/total) +![CodeQL](https://github.com/cricketthomas/azurekeyvaultexplorer/workflows/CodeQL/badge.svg)

Named 'Key Vault Explorer' in the Microsoft Store.

@@ -32,7 +33,7 @@ Download from the [releases page](https://github.com/cricketthomas/AzureKeyVault ## Overview Visit the releases section to download the application for mac and linux. -**Key Vault Explorer** is a lightweight tool with the idea to simplify finding and accessing secrets (and certificates and keys) stored in Azure Key Vault, providing a interface for aggregating, filtering, and quickly getting secret values. The app was inspired by the original [AzureKeyVaultExplorer](https://github.com/microsoft/AzureKeyVaultExplorer) with the goal to eventually bring some more feature parity but first brining the application to macOS. +**Key Vault Explorer** is a lightweight tool with the idea to simplify finding and accessing secrets (and certificates and keys) stored in Azure Key Vault, providing a interface for aggregating, filtering, and quickly getting secret values. The app was inspired by the original [AzureKeyVaultExplorer](https://github.com/microsoft/AzureKeyVaultExplorer) with the goal to eventually bring some more feature parity but first bringing the application to macOS. ### Key features @@ -72,7 +73,7 @@ The SQLite database is encrypted using DPAPI on windows, and on macOS the passwo ### Get it from the [releases](https://github.com/cricketthomas/AzureKeyVaultExplorer/releases) page or the Microsoft Store. -#### macOS +### macOS After downloading the `.app` bundle, macOS may block it because it's from an unidentified developer. To fix this, run: ```bash diff --git a/src/uno/AzureKeyVaultStudio.slnx b/src/uno/AzureKeyVaultStudio.slnx index b849bbb4..2d952a7a 100644 --- a/src/uno/AzureKeyVaultStudio.slnx +++ b/src/uno/AzureKeyVaultStudio.slnx @@ -6,5 +6,5 @@ - + diff --git a/src/uno/AzureKeyVaultStudio/.editorconfig b/src/uno/AzureKeyVaultStudio/.editorconfig deleted file mode 100644 index ee73562b..00000000 --- a/src/uno/AzureKeyVaultStudio/.editorconfig +++ /dev/null @@ -1,167 +0,0 @@ -; This file is for unifying the coding style for different editors and IDEs. -; More information at http://editorconfig.org - -# This file is the top-most EditorConfig file -root = true - -########################################## -# Common Settings -########################################## - -[*] -indent_style = space -end_of_line = crlf -trim_trailing_whitespace = true -insert_final_newline = true -charset = utf-8 - -########################################## -# File Extension Settings -########################################## - -[*.{yml,yaml}] -indent_size = 2 - -[.vsconfig] -indent_size = 2 -end_of_line = lf - -[*.sln] -indent_style = tab -indent_size = 2 - -[*.{csproj,proj,projitems,shproj}] -indent_size = 4 - -[*.{json,slnf}] -indent_size = 2 -end_of_line = lf - -[*.{props,targets}] -indent_size = 4 - -[*.xaml] -indent_size = 4 -charset = utf-8-bom - -[*.xml] -indent_size = 4 -end_of_line = lf - -[*.plist] -indent_size = 4 -indent_style = tab -end_of_line = lf - -[*.manifest] -indent_size = 4 - -[*.appxmanifest] -indent_size = 4 - -[*.{json,css,webmanifest}] -indent_size = 2 -end_of_line = lf - -[web.config] -indent_size = 4 -end_of_line = lf - -[*.sh] -indent_size = 2 -end_of_line = lf - -[*.cs] -# EOL should be normalized by Git. See https://github.com/dotnet/format/issues/1099 -end_of_line = unset - -# See https://github.com/dotnet/roslyn/issues/20356#issuecomment-310143926 -trim_trailing_whitespace = false - -tab_width = 4 -indent_size = 4 - -# Sort using and Import directives with System.* appearing first -dotnet_sort_system_directives_first = true - -# Avoid "this." and "Me." if not necessary -dotnet_style_qualification_for_field = false:suggestion -dotnet_style_qualification_for_property = false:suggestion -dotnet_style_qualification_for_method = false:suggestion -dotnet_style_qualification_for_event = false:suggestion - -#### Naming styles #### - -# Naming rules - -dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion -dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface -dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i - -dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion -dotnet_naming_rule.types_should_be_pascal_case.symbols = types -dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case - -dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion -dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members -dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case - -# Symbol specifications - -dotnet_naming_symbols.interface.applicable_kinds = interface -dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.interface.required_modifiers = - -dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum -dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.types.required_modifiers = - -dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method -dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.non_field_members.required_modifiers = - -# Naming styles - -dotnet_naming_style.begins_with_i.required_prefix = I -dotnet_naming_style.begins_with_i.required_suffix = -dotnet_naming_style.begins_with_i.word_separator = -dotnet_naming_style.begins_with_i.capitalization = pascal_case - -dotnet_naming_style.pascal_case.required_prefix = -dotnet_naming_style.pascal_case.required_suffix = -dotnet_naming_style.pascal_case.word_separator = -dotnet_naming_style.pascal_case.capitalization = pascal_case - -dotnet_naming_style.pascal_case.required_prefix = -dotnet_naming_style.pascal_case.required_suffix = -dotnet_naming_style.pascal_case.word_separator = -dotnet_naming_style.pascal_case.capitalization = pascal_case -dotnet_style_operator_placement_when_wrapping = beginning_of_line -dotnet_style_coalesce_expression = true:suggestion -dotnet_style_null_propagation = true:suggestion -dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion -dotnet_style_prefer_auto_properties = true:silent -dotnet_style_object_initializer = true:suggestion -dotnet_style_collection_initializer = true:suggestion -dotnet_style_prefer_simplified_boolean_expressions = true:suggestion -dotnet_style_prefer_conditional_expression_over_assignment = true:silent -dotnet_style_prefer_conditional_expression_over_return = true:silent -dotnet_style_explicit_tuple_names = true:suggestion -dotnet_style_prefer_inferred_tuple_names = true:suggestion - -csharp_indent_labels = one_less_than_current -csharp_using_directive_placement = outside_namespace:silent -csharp_prefer_simple_using_statement = true:suggestion -csharp_prefer_braces = true:silent -csharp_style_namespace_declarations = file_scoped:warning -csharp_style_prefer_method_group_conversion = true:silent -csharp_style_prefer_top_level_statements = true:silent -csharp_style_prefer_primary_constructors = true:suggestion -csharp_style_expression_bodied_methods = false:silent -csharp_style_expression_bodied_constructors = false:silent -csharp_style_expression_bodied_operators = false:silent -csharp_style_expression_bodied_properties = true:silent -csharp_style_expression_bodied_indexers = true:silent -csharp_style_expression_bodied_accessors = true:silent -csharp_style_expression_bodied_lambdas = true:silent -csharp_style_expression_bodied_local_functions = false:silent diff --git a/src/uno/AzureKeyVaultStudio/.gitattributes b/src/uno/AzureKeyVaultStudio/.gitattributes deleted file mode 100644 index 1ff0c423..00000000 --- a/src/uno/AzureKeyVaultStudio/.gitattributes +++ /dev/null @@ -1,63 +0,0 @@ -############################################################################### -# Set default behavior to automatically normalize line endings. -############################################################################### -* text=auto - -############################################################################### -# Set default behavior for command prompt diff. -# -# This is need for earlier builds of msysgit that does not have it on by -# default for csharp files. -# Note: This is only used by command line -############################################################################### -#*.cs diff=csharp - -############################################################################### -# Set the merge driver for project and solution files -# -# Merging from the command prompt will add diff markers to the files if there -# are conflicts (Merging from VS is not affected by the settings below, in VS -# the diff markers are never inserted). Diff markers may cause the following -# file extensions to fail to load in VS. An alternative would be to treat -# these files as binary and thus will always conflict and require user -# intervention with every merge. To do so, just uncomment the entries below -############################################################################### -#*.sln merge=binary -#*.csproj merge=binary -#*.vbproj merge=binary -#*.vcxproj merge=binary -#*.vcproj merge=binary -#*.dbproj merge=binary -#*.fsproj merge=binary -#*.lsproj merge=binary -#*.wixproj merge=binary -#*.modelproj merge=binary -#*.sqlproj merge=binary -#*.wwaproj merge=binary - -############################################################################### -# behavior for image files -# -# image files are treated as binary by default. -############################################################################### -#*.jpg binary -#*.png binary -#*.gif binary - -############################################################################### -# diff behavior for common document formats -# -# Convert binary document formats to text before diffing them. This feature -# is only available from the command line. Turn it on by uncommenting the -# entries below. -############################################################################### -#*.doc diff=astextplain -#*.DOC diff=astextplain -#*.docx diff=astextplain -#*.DOCX diff=astextplain -#*.dot diff=astextplain -#*.DOT diff=astextplain -#*.pdf diff=astextplain -#*.PDF diff=astextplain -#*.rtf diff=astextplain -#*.RTF diff=astextplain diff --git a/src/uno/AzureKeyVaultStudio/.gitignore b/src/uno/AzureKeyVaultStudio/.gitignore deleted file mode 100644 index f04ef048..00000000 --- a/src/uno/AzureKeyVaultStudio/.gitignore +++ /dev/null @@ -1,488 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from `dotnet new gitignore` - -# dotenv files -.env - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Ww][Ii][Nn]32/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET -project.lock.json -project.fragment.lock.json -artifacts/ - -# Tye -.tye/ - -# ASP.NET Scaffolding -ScaffoldingReadMe.txt - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -# but not Directory.Build.rsp, as it configures directory-level build defaults -!Directory.Build.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.tlog -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*.json -coverage*.xml -coverage*.info - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio 6 auto-generated project file (contains which files were open etc.) -*.vbp - -# Visual Studio 6 workspace and project file (working project files containing files to include in project) -*.dsw -*.dsp - -# Visual Studio 6 technical files -*.ncb -*.aps - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# Visual Studio History (VSHistory) files -.vshistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -# Fody - auto-generated XML schema -FodyWeavers.xsd - -# VS Code files for those working on multiple tools -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json -*.code-workspace - -# Local History for Visual Studio Code -.history/ - -# Windows Installer files from build outputs -*.cab -*.msi -*.msix -*.msm -*.msp - -# JetBrains Rider -*.sln.iml -.idea/ - -## -## Visual studio for Mac -## - - -# globs -Makefile.in -*.userprefs -*.usertasks -config.make -config.status -aclocal.m4 -install-sh -autom4te.cache/ -*.tar.gz -tarballs/ -test-results/ - -# content below from: https://github.com/github/gitignore/blob/main/Global/macOS.gitignore -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# content below from: https://github.com/github/gitignore/blob/main/Global/Windows.gitignore -# Windows thumbnail cache files -Thumbs.db -ehthumbs.db -ehthumbs_vista.db - -# Dump file -*.stackdump - -# Folder config file -[Dd]esktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp - -# Windows shortcuts -*.lnk - -# Vim temporary swap files -*.swp - -# Single Target Config -solution-config.props -# Publish Profiles -!**/Properties/PublishProfiles/*.pubxml -/AzureKeyVaultStudio/publish* diff --git a/src/uno/AzureKeyVaultStudio/.run/AzureKeyVaultStudio.run.xml b/src/uno/AzureKeyVaultStudio/.run/AzureKeyVaultStudio.run.xml deleted file mode 100644 index 664e17bc..00000000 --- a/src/uno/AzureKeyVaultStudio/.run/AzureKeyVaultStudio.run.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - diff --git a/src/uno/AzureKeyVaultStudio/.run/Readme.md b/src/uno/AzureKeyVaultStudio/.run/Readme.md deleted file mode 100644 index 6e72638a..00000000 --- a/src/uno/AzureKeyVaultStudio/.run/Readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# About the `.run` folder - -This folder is present to add support for the [Rider IDE](https://aka.platform.uno/rider-getstarted). You can remove this folder safely if you're not using Rider. diff --git a/src/uno/AzureKeyVaultStudio/.vscode/extensions.json b/src/uno/AzureKeyVaultStudio/.vscode/extensions.json deleted file mode 100644 index a63ad400..00000000 --- a/src/uno/AzureKeyVaultStudio/.vscode/extensions.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "recommendations": [ - "unoplatform.vscode" - ], -} diff --git a/src/uno/AzureKeyVaultStudio/.vscode/launch.json b/src/uno/AzureKeyVaultStudio/.vscode/launch.json deleted file mode 100644 index b7caa875..00000000 --- a/src/uno/AzureKeyVaultStudio/.vscode/launch.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - // Use IntelliSense to find out which attributes exist for C# debugging - // Use hover for the description of the existing attributes - // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md - "version": "0.2.0", - "configurations": [ - { - // Use IntelliSense to find out which attributes exist for C# debugging - // Use hover for the description of the existing attributes - // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md - "name": "Uno Platform Desktop Debug", - "type": "coreclr", - "request": "launch", - "preLaunchTask": "build-desktop", - // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/AzureKeyVaultStudio/bin/Debug/net10.0-desktop/AzureKeyVaultStudio.dll", - "args": [], - "launchSettingsProfile": "AzureKeyVaultStudio (Desktop)", - "env": { - "DOTNET_MODIFIABLE_ASSEMBLIES": "debug" - }, - "cwd": "${workspaceFolder}/AzureKeyVaultStudio", - // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console - "console": "internalConsole", - "stopAtEntry": false - }, - ] -} diff --git a/src/uno/AzureKeyVaultStudio/.vscode/settings.json b/src/uno/AzureKeyVaultStudio/.vscode/settings.json deleted file mode 100644 index 3405922d..00000000 --- a/src/uno/AzureKeyVaultStudio/.vscode/settings.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "explorer.fileNesting.enabled": true, - "explorer.fileNesting.expand": false, - "explorer.fileNesting.patterns": { - "*.xaml": "$(capture).xaml.cs" - }, - "files.associations": { - "global.json": "jsonc" - } -} diff --git a/src/uno/AzureKeyVaultStudio/.vscode/tasks.json b/src/uno/AzureKeyVaultStudio/.vscode/tasks.json deleted file mode 100644 index fd5c11fb..00000000 --- a/src/uno/AzureKeyVaultStudio/.vscode/tasks.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "version": "2.0.0", - "tasks": [ - { - "label": "build-desktop", - "command": "dotnet", - "type": "process", - "args": [ - "build", - "${workspaceFolder}/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj", - "/property:GenerateFullPaths=true", - "/property:TargetFramework=net10.0-desktop", - "/consoleloggerparameters:NoSummary" - ], - "problemMatcher": "$msCompile" - }, - { - "label": "publish-desktop", - "command": "dotnet", - "type": "process", - "args": [ - "publish", - "${workspaceFolder}/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj", - "/property:GenerateFullPaths=true", - "/property:TargetFramework=net10.0-desktop", - "/consoleloggerparameters:NoSummary" - ], - "problemMatcher": "$msCompile" - } - ] -} diff --git a/src/uno/AzureKeyVaultStudio/.vsconfig b/src/uno/AzureKeyVaultStudio/.vsconfig deleted file mode 100644 index 73997027..00000000 --- a/src/uno/AzureKeyVaultStudio/.vsconfig +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": "1.0", - "components": [ - "Microsoft.VisualStudio.Component.CoreEditor", - "Microsoft.VisualStudio.Workload.CoreEditor", - "Microsoft.NetCore.Component.SDK", - "Microsoft.NetCore.Component.DevelopmentTools", - "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites", - "Microsoft.VisualStudio.Component.TextTemplating", - "Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging", - "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites", - "Microsoft.VisualStudio.Component.Debugger.JustInTime", - "Microsoft.VisualStudio.Workload.ManagedDesktop", - "Microsoft.VisualStudio.Workload.NetCrossPlat", - "Microsoft.VisualStudio.Workload.NetCoreTools" - ] -} diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/App.xaml b/src/uno/AzureKeyVaultStudio/App.xaml similarity index 97% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/App.xaml rename to src/uno/AzureKeyVaultStudio/App.xaml index e88216c9..8a55d4eb 100644 --- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/App.xaml +++ b/src/uno/AzureKeyVaultStudio/App.xaml @@ -20,6 +20,7 @@ + { Debug.WriteLine($"[FirstChance] {e.Exception.GetType().FullName}: {e.Exception.Message}"); @@ -35,22 +46,24 @@ public App() UnhandledException += (sender, args) => { Debug.WriteLine($"[Unhandled] {args.Exception}"); -#if DEBUG + args.Handled = true; -#else // Do not swallow in packaged Release while diagnosing. - args.Handled = false; -#endif + //args.Handled = false; }; +#endif } public Window? MainWindow { get; private set; } public IHost? Host { get; private set; } public string AppTitle { get; init; } = "Key Vault Explorer"; + private IDisposable? _devTools; + + + [SuppressMessage(category: "Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "Uno.Extensions APIs are used in a way that is safe for trimming in this template context.")] protected override async void OnLaunched(LaunchActivatedEventArgs args) { - _ = DbContext.InitializeDatabase(); var builder = this.CreateBuilder(args) .UseToolkitNavigation() @@ -75,18 +88,18 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args) #if DEBUG //Uno Platform namespace filter groups //Uncomment individual methods to see more detailed logging - // Generic Xaml events - logBuilder.XamlLogLevel(logLevel); - // Layout specific messages - logBuilder.XamlLayoutLogLevel(logLevel); - // Storage messages - logBuilder.StorageLogLevel(logLevel); - // Binding related messages - logBuilder.XamlBindingLogLevel(logLevel); - // Binder memory references tracking - logBuilder.BinderMemoryReferenceLogLevel(logLevel); - // DevServer and HotReload related - logBuilder.HotReloadCoreLogLevel(logLevel); + //// Generic Xaml events + //logBuilder.XamlLogLevel(logLevel); + //// Layout specific messages + //logBuilder.XamlLayoutLogLevel(logLevel); + //// Storage messages + //logBuilder.StorageLogLevel(logLevel); + //// Binding related messages + //logBuilder.XamlBindingLogLevel(logLevel); + //// Binder memory references tracking + //logBuilder.BinderMemoryReferenceLogLevel(logLevel); + //// DevServer and HotReload related + //logBuilder.HotReloadCoreLogLevel(logLevel); #endif }, enableUnoLogging: true) @@ -100,7 +113,7 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args) // Enable localization (see appsettings.json for supported languages) .UseLocalization() .UseAuthentication(auth => - auth.AddCustom(custom => + auth.AddCustom(custom => custom.Login(async (sp, dispatcher, credentials, cancellationToken) => { try @@ -167,10 +180,11 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args) MainWindow = builder.Window; MainWindow.Title = AppTitle; EnsureEarlyWindow(MainWindow); - //builder.Build(); + #if DEBUG - MainWindow.UseStudio(); + //MainWindow.UseStudio(); #endif + MainWindow.SetWindowIcon(); Host = await builder.NavigateAsync @@ -186,7 +200,18 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args) { await navigator.NavigateViewModelAsync(this, qualifier: Qualifiers.Nested); } + + _ = DbContext.InitializeDatabase(); + }); +#if HAS_UNO_SKIA && !WINDOWS && DEBUG + _devTools = MainWindow.AttachDevTools(new DevToolsOptions + { + LaunchView = DevToolsViewKind.VisualTree, + ShowAsChildWindow = false, + }); +#endif + } private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes) @@ -221,20 +246,18 @@ private static void EnsureEarlyWindow(Window window) window.AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode; //if (Microsoft.UI.Windowing.AppWindowTitleBar.IsCustomizationSupported()) //{ - //} //window.ExtendsContentIntoTitleBar = true; - //var theme = window.GetThemeService(); - //window.AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode; - //window.AppWindow.TitleBar.PreferredTheme = theme.Theme switch + //} + + //var content = window.Content?.XamlRoot?.Content as FrameworkElement; + + //window.AppWindow.TitleBar.PreferredTheme = content?.RequestedTheme switch //{ - // AppTheme.Light => TitleBarTheme.Light, - // AppTheme.Dark => TitleBarTheme.Dark, + // ElementTheme.Light => TitleBarTheme.Light, + // ElementTheme.Dark => TitleBarTheme.Dark, // _ => TitleBarTheme.UseDefaultAppMode, //}; - - //window.AppWindow.TitleBar.ButtonBackgroundColor = Microsoft.UI.Colors.Transparent; - window.SystemBackdrop = new MicaBackdrop() { Kind = MicaKind.Base, @@ -244,5 +267,4 @@ private static void EnsureEarlyWindow(Window window) #endif } - } diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/CustomCompactStyles.xaml b/src/uno/AzureKeyVaultStudio/Assets/CustomCompactStyles.xaml similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/CustomCompactStyles.xaml rename to src/uno/AzureKeyVaultStudio/Assets/CustomCompactStyles.xaml diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Icons/appicon.png b/src/uno/AzureKeyVaultStudio/Assets/Icons/appicon.png similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Icons/appicon.png rename to src/uno/AzureKeyVaultStudio/Assets/Icons/appicon.png diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Icons/icon.svg b/src/uno/AzureKeyVaultStudio/Assets/Icons/icon.svg similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Icons/icon.svg rename to src/uno/AzureKeyVaultStudio/Assets/Icons/icon.svg diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Icons/icon_foreground.svg b/src/uno/AzureKeyVaultStudio/Assets/Icons/icon_foreground.svg similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Icons/icon_foreground.svg rename to src/uno/AzureKeyVaultStudio/Assets/Icons/icon_foreground.svg diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Images/AppIcon.png b/src/uno/AzureKeyVaultStudio/Assets/Images/AppIcon.png similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Images/AppIcon.png rename to src/uno/AzureKeyVaultStudio/Assets/Images/AppIcon.png diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Images/kv-gray-3.png b/src/uno/AzureKeyVaultStudio/Assets/Images/kv-gray-3.png similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Images/kv-gray-3.png rename to src/uno/AzureKeyVaultStudio/Assets/Images/kv-gray-3.png diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Images/kv-gray.png b/src/uno/AzureKeyVaultStudio/Assets/Images/kv-gray.png similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Images/kv-gray.png rename to src/uno/AzureKeyVaultStudio/Assets/Images/kv-gray.png diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Images/kv-gray2.png b/src/uno/AzureKeyVaultStudio/Assets/Images/kv-gray2.png similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Images/kv-gray2.png rename to src/uno/AzureKeyVaultStudio/Assets/Images/kv-gray2.png diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Images/kvgray.svg b/src/uno/AzureKeyVaultStudio/Assets/Images/kvgray.svg similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Images/kvgray.svg rename to src/uno/AzureKeyVaultStudio/Assets/Images/kvgray.svg diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/SharedAssets.md b/src/uno/AzureKeyVaultStudio/Assets/SharedAssets.md similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/SharedAssets.md rename to src/uno/AzureKeyVaultStudio/Assets/SharedAssets.md diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Splash/splash_screen.svg b/src/uno/AzureKeyVaultStudio/Assets/Splash/splash_screen.svg similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Splash/splash_screen.svg rename to src/uno/AzureKeyVaultStudio/Assets/Splash/splash_screen.svg diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Styles.xaml b/src/uno/AzureKeyVaultStudio/Assets/Styles.xaml similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Assets/Styles.xaml rename to src/uno/AzureKeyVaultStudio/Assets/Styles.xaml diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj similarity index 82% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj rename to src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj index f1de8afa..b5d2e3ed 100644 --- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj +++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj @@ -19,7 +19,7 @@ Azure Key Vault Explorer — a cross platform GUI desktop application for aggregating secrets (and keys and certificates) in Azure Key Vault - en;es;fr;pt-BR + en;es;fr;pt-BR;de true @@ -62,6 +62,7 @@ false true false + true true true false @@ -70,7 +71,6 @@ false false copy - none false $(NoWarn);IL2104 @@ -97,6 +97,8 @@ + + @@ -105,6 +107,7 @@ + @@ -114,6 +117,31 @@ + + + + + + PublicResXFileCodeGenerator + Resources.Designer.cs + + PreserveNewest + + + + + + True + True + Resources.resx + + + + + + PublicResXFileCodeGenerator + Resources.Designer.cs + diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio.slnx b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio.slnx index 349a5556..2d952a7a 100644 --- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio.slnx +++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio.slnx @@ -6,7 +6,5 @@ - - - + diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Database/Subscriptions.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Database/Subscriptions.cs deleted file mode 100644 index af202bc0..00000000 --- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Database/Subscriptions.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace AzureKeyVaultStudio.Database; - -public class Subscriptions -{ - public string DisplayName { get; set; } - public string SubscriptionId { get; set; } - public Guid TenantId { get; set; } -} \ No newline at end of file diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/SecondPage.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/SecondPage.xaml deleted file mode 100644 index 75828902..00000000 --- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/SecondPage.xaml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml.cs b/src/uno/AzureKeyVaultStudio/UserControls/NewItem.xaml.cs similarity index 97% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml.cs rename to src/uno/AzureKeyVaultStudio/UserControls/NewItem.xaml.cs index 3d99af2a..08782cb3 100644 --- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml.cs +++ b/src/uno/AzureKeyVaultStudio/UserControls/NewItem.xaml.cs @@ -8,7 +8,7 @@ namespace AzureKeyVaultStudio.UserControls; public sealed partial class NewItem : UserControl { - public NewVersionViewModel ViewModel => DataContext as NewVersionViewModel; + public NewVersionViewModel? ViewModel => DataContext as NewVersionViewModel; public Window? ParentWindow { get; set; } private IStringLocalizer? _localizer { get; set; } diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml b/src/uno/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml similarity index 78% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml rename to src/uno/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml index 693fbff1..f79d7696 100644 --- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml +++ b/src/uno/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml @@ -24,9 +24,9 @@ Spacing="4" Visibility="{x:Bind ViewModel.IsNew, Converter={StaticResource BoolToVisibilityConverter}}"> + VerticalAlignment="Center" /> @@ -35,19 +35,19 @@ Spacing="4" Visibility="{x:Bind ViewModel.IsNew, Converter={StaticResource BoolToVisibilityConverter}}"> + VerticalAlignment="Center" /> + x:Uid="SetActivationDateCheckbox" + IsChecked="{x:Bind ViewModel.HasActivationDateChecked, Mode=TwoWay}"> - + + x:Uid="SetExpirationDateCheckbox" + IsChecked="{x:Bind ViewModel.HasExpirationDateChecked, Mode=TwoWay}"> - + - + VerticalAlignment="Center" /> + - + @@ -98,16 +95,16 @@ Spacing="5" Visibility="{x:Bind ViewModel.IsEdit, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter=True}"> + VerticalAlignment="Center" /> diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml.cs b/src/uno/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml.cs similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml.cs rename to src/uno/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml.cs diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/OverrideTitlebar.xaml b/src/uno/AzureKeyVaultStudio/UserControls/OverrideTitlebar.xaml similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/OverrideTitlebar.xaml rename to src/uno/AzureKeyVaultStudio/UserControls/OverrideTitlebar.xaml diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/OverrideTitlebar.xaml.cs b/src/uno/AzureKeyVaultStudio/UserControls/OverrideTitlebar.xaml.cs similarity index 81% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/OverrideTitlebar.xaml.cs rename to src/uno/AzureKeyVaultStudio/UserControls/OverrideTitlebar.xaml.cs index a3a44d55..a1d2c4a8 100644 --- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/OverrideTitlebar.xaml.cs +++ b/src/uno/AzureKeyVaultStudio/UserControls/OverrideTitlebar.xaml.cs @@ -1,4 +1,6 @@ using System.Diagnostics; +using AzureKeyVaultStudio.Messages; +using CommunityToolkit.Mvvm.Messaging; using Microsoft.UI.Dispatching; using Microsoft.UI.Windowing; using Microsoft.UI.Xaml.Input; @@ -37,45 +39,40 @@ public string SecondaryTitle private AppWindow? _appWindow; - - //#if WINDOWS && !MACCATALYST && !HAS_UNO - // public UIElement? TitleBarElement => DefaultTitleBar; - //#endif - public OverrideTitlebar() { this.InitializeComponent(); _appWindow = (Application.Current as App)?.MainWindow?.AppWindow; - if (_appWindow is not null) { - //_appWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode; if (!string.IsNullOrWhiteSpace(SecondaryTitle)) - _appWindow.Title = SecondaryTitle ; - + _appWindow.Title = SecondaryTitle; } + + WeakReferenceMessenger.Default.Register(this, async (r, m) => await GoBack()); + this.Unloaded += OnUnloaded; } - private async void BackButton_Click(object sender, RoutedEventArgs e) + private void OnUnloaded(object sender, RoutedEventArgs e) { - await GoBack(); + WeakReferenceMessenger.Default.Unregister(this); } - private async void DefaultTitleBar_BackRequested(TitleBar sender, object args) + private async void BackButton_Click(object sender, RoutedEventArgs e) { await GoBack(); } - private async void Page_PointerPressed(object sender, PointerRoutedEventArgs e) + private async void DefaultTitleBar_BackRequested(TitleBar sender, object args) { - if (e.GetCurrentPoint(sender as UIElement).Properties.IsXButton1Pressed) - { - await GoBack(); - } + await GoBack(); } private async Task GoBack() { + if (!this.IsLoaded || XamlRoot == null) + return; + var navigator = this.Navigator(); if (navigator == null) return; diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/SharedWindow.xaml b/src/uno/AzureKeyVaultStudio/UserControls/SharedWindow.xaml similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/SharedWindow.xaml rename to src/uno/AzureKeyVaultStudio/UserControls/SharedWindow.xaml diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/SharedWindow.xaml.cs b/src/uno/AzureKeyVaultStudio/UserControls/SharedWindow.xaml.cs similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/SharedWindow.xaml.cs rename to src/uno/AzureKeyVaultStudio/UserControls/SharedWindow.xaml.cs diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/StatusBarControl.xaml b/src/uno/AzureKeyVaultStudio/UserControls/StatusBarControl.xaml similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/StatusBarControl.xaml rename to src/uno/AzureKeyVaultStudio/UserControls/StatusBarControl.xaml diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/StatusBarControl.xaml.cs b/src/uno/AzureKeyVaultStudio/UserControls/StatusBarControl.xaml.cs similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/StatusBarControl.xaml.cs rename to src/uno/AzureKeyVaultStudio/UserControls/StatusBarControl.xaml.cs diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml b/src/uno/AzureKeyVaultStudio/UserControls/TagsEditor.xaml similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml rename to src/uno/AzureKeyVaultStudio/UserControls/TagsEditor.xaml diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs b/src/uno/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs rename to src/uno/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ToolPane.cs b/src/uno/AzureKeyVaultStudio/UserControls/ToolPane.cs similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ToolPane.cs rename to src/uno/AzureKeyVaultStudio/UserControls/ToolPane.cs diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/ItemPropertiesViewModel.cs b/src/uno/AzureKeyVaultStudio/UserControls/ViewModels/ItemPropertiesViewModel.cs similarity index 99% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/ItemPropertiesViewModel.cs rename to src/uno/AzureKeyVaultStudio/UserControls/ViewModels/ItemPropertiesViewModel.cs index d90e4589..3055f4e8 100644 --- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/ItemPropertiesViewModel.cs +++ b/src/uno/AzureKeyVaultStudio/UserControls/ViewModels/ItemPropertiesViewModel.cs @@ -271,7 +271,7 @@ public async Task GetPropertiesForKeyVaultValue(KeyVaultItemProperties model) { case KeyVaultItemType.Certificate: var certificateProperties = await _vaultService.GetCertificateProperties(model.VaultUri, model.Name); - var latestCert = Enumerable.MaxBy(certificateProperties, x => x.UpdatedOn)!; + var latestCert = Enumerable.MaxBy(certificateProperties, x => x.CreatedOn)!; ItemPropertiesList = new ObservableCollection(KeyVaultItemProperties.FromCertificateProperties(certificateProperties)); IsEnabled = latestCert.Enabled ?? false; IsCertificate = true; @@ -280,7 +280,7 @@ public async Task GetPropertiesForKeyVaultValue(KeyVaultItemProperties model) case KeyVaultItemType.Key: var keyPropertiesList = await _vaultService.GetKeyProperties(model.VaultUri, model.Name); - var latestKey = Enumerable.MaxBy(keyPropertiesList, x => x.UpdatedOn)!; + var latestKey = Enumerable.MaxBy(keyPropertiesList, x => x.CreatedOn)!; IsManaged = latestKey.Managed; IsEnabled = latestKey.Enabled ?? false; ItemPropertiesList = new ObservableCollection(KeyVaultItemProperties.FromKeyProperties(keyPropertiesList)); @@ -290,7 +290,7 @@ public async Task GetPropertiesForKeyVaultValue(KeyVaultItemProperties model) case KeyVaultItemType.Secret: var secretPropertiesList = await _vaultService.GetSecretProperties(model.VaultUri, model.Name); - var latestSecret = Enumerable.MaxBy(secretPropertiesList, x => x.UpdatedOn)!; + var latestSecret = Enumerable.MaxBy(secretPropertiesList, x => x.CreatedOn)!; IsManaged = latestSecret.Managed; IsEnabled = latestSecret.Enabled ?? false; ItemPropertiesList = new ObservableCollection(KeyVaultItemProperties.FromSecretProperties(secretPropertiesList)); diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/KeyVaultTreeViewModel.cs b/src/uno/AzureKeyVaultStudio/UserControls/ViewModels/KeyVaultTreeViewModel.cs similarity index 88% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/KeyVaultTreeViewModel.cs rename to src/uno/AzureKeyVaultStudio/UserControls/ViewModels/KeyVaultTreeViewModel.cs index af99007b..857aff65 100644 --- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/KeyVaultTreeViewModel.cs +++ b/src/uno/AzureKeyVaultStudio/UserControls/ViewModels/KeyVaultTreeViewModel.cs @@ -42,7 +42,7 @@ public KeyVaultTreeViewModel(AuthService authService, VaultService vaultService, WeakReferenceMessenger.Default.Register(this, async (r, m) => { - await PinVaultToQuickAccess(m.KeyVaultResource); + await PinToQuickAccessInternal(m.KeyVaultResource); }); } @@ -51,6 +51,9 @@ public KeyVaultTreeViewModel(AuthService authService, VaultService vaultService, [ObservableProperty] public partial bool IsBusy { get; set; } = false; + [ObservableProperty] + public partial bool HasFetchedData { get; set; } = false; + [ObservableProperty] public partial string SearchQuery { get; set; } = string.Empty; @@ -69,12 +72,22 @@ public KeyVaultTreeViewModel(AuthService authService, VaultService vaultService, public void ExpandAll() => _ = Task.Run(() => _dispatcher.TryEnqueue(() => TreeDataSource.ForEach(item => item.IsExpanded = true))); [RelayCommand(FlowExceptionsToTaskScheduler = true)] - public async Task PinVaultToQuickAccess(KeyVaultResource model) + public async Task PinVaultToQuickAccess(KvTreeNodeModel item) { - if (model is null) + if (item is null) return; + if (item.VaultResource is KeyVaultResource model) + { + bool flowControl = await PinToQuickAccessInternal(model); + if (!flowControl) + return; + } + } + + private async Task PinToQuickAccessInternal(KeyVaultResource model) + { var exists = await DbContext.QuickAccessItemByKeyVaultIdExists(model.Id); - if (exists) return; + if (exists) return false; var qa = new QuickAccess { KeyVaultId = model.Id, @@ -88,16 +101,17 @@ public async Task PinVaultToQuickAccess(KeyVaultResource model) _dispatcher.TryEnqueue(() => { var items = new ObservableCollection(TreeDataSource[0].Children.OfType()) - { + { new KvKeyVaultResourceModel { DisplayName = model.Data.Name, Resource = model, } - }; + }; TreeDataSource[0].Children.Clear(); TreeDataSource[0].Children.AddRange(items); }); + return true; } [RelayCommand(FlowExceptionsToTaskScheduler = true, IncludeCancelCommand = true, AllowConcurrentExecutions = false)] @@ -111,25 +125,27 @@ private async Task Refresh(CancellationToken token) } [RelayCommand] - private async Task RemovePinVaultToQuickAccess(KeyVaultResource model) + private async Task RemovePinVaultToQuickAccess(KvTreeNodeModel item) { - if (model is null) + if (item is null) return; + if (item.VaultResource is KeyVaultResource model) + { + var exists = await DbContext.QuickAccessItemByKeyVaultIdExists(model.Id); + if (!exists) return; - var exists = await DbContext.QuickAccessItemByKeyVaultIdExists(model.Id); - if (!exists) return; - - await DbContext.DeleteQuickAccessItemByKeyVaultId(model.Id); + await DbContext.DeleteQuickAccessItemByKeyVaultId(model.Id); - _dispatcher.TryEnqueue(() => - { - var items = new ObservableCollection( - TreeDataSource[0].Children - .OfType() - .Where(s => s.VaultResource?.Data.Id != model.Id)); - TreeDataSource[0].Children.Clear(); - TreeDataSource[0].Children.AddRange(items); - }); + _dispatcher.TryEnqueue(() => + { + var items = new ObservableCollection( + TreeDataSource[0].Children + .OfType() + .Where(s => s.VaultResource?.Data.Id != model.Id)); + TreeDataSource[0].Children.Clear(); + TreeDataSource[0].Children.AddRange(items); + }); + } } [RelayCommand] @@ -199,6 +215,7 @@ private async Task InitializeTreeDataSource(CancellationToken token) sub.Children.CollectionChanged += TreeViewSubNode_CollectionChanged; } } + HasFetchedData = true; } catch (Exception ex) { @@ -337,19 +354,25 @@ private Task ExecuteSearch(CancellationToken token) } [RelayCommand] - private async Task OpenInAzure(KeyVaultResource model) + private async Task OpenInAzure(KvTreeNodeModel item) { - if (model is null) return; - string tenantName = _authService.TenantName; - string portalBaseUri = _authService.AzurePortalBaseUri; - var uri = new Uri($"{portalBaseUri}/#@{tenantName}/resource{model.Id}"); - await Launcher.LaunchUriAsync(uri); + if (item is null) return; + + if (item.VaultResource is KeyVaultResource model) + { + string tenantName = _authService.TenantName; + string portalBaseUri = _authService.AzurePortalBaseUri; + var uri = new Uri($"{portalBaseUri}/#@{tenantName}/resource{model.Id}"); + await Launcher.LaunchUriAsync(uri); + } } [RelayCommand] - private static void OpenInNewTab(KeyVaultResource model) + private static void OpenInNewTab(KvTreeNodeModel item) { - if (model is KeyVaultResource) + if (item is null) return; + + if (item.VaultResource is KeyVaultResource model) { WeakReferenceMessenger.Default.Send(new AddDocumentMessage(model.Data)); } @@ -399,7 +422,7 @@ internal void SetDispatcher(IDispatcher dispatcher) _dispatcher = dispatcher; } - partial void OnTreeDataSourceChanging(ObservableCollection? oldValue, ObservableCollection? newValue) + partial void OnTreeDataSourceChanging(ObservableCollection oldValue, ObservableCollection newValue) { if (oldValue is null) return; @@ -418,7 +441,7 @@ partial void OnTreeDataSourceChanging(ObservableCollection? } } - partial void OnTreeDataSourceChanged(ObservableCollection? value) + partial void OnTreeDataSourceChanged(ObservableCollection value) { if (value is null) return; diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/NewVersionViewModel.cs b/src/uno/AzureKeyVaultStudio/UserControls/ViewModels/NewVersionViewModel.cs similarity index 93% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/NewVersionViewModel.cs rename to src/uno/AzureKeyVaultStudio/UserControls/ViewModels/NewVersionViewModel.cs index 9b08b1b0..f9bf1f4f 100644 --- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/NewVersionViewModel.cs +++ b/src/uno/AzureKeyVaultStudio/UserControls/ViewModels/NewVersionViewModel.cs @@ -2,6 +2,7 @@ using Azure.Security.KeyVault.Secrets; using AzureKeyVaultStudio.Messages; using AzureKeyVaultStudio.Services; +using AzureKeyVaultStudio.Strings; using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.WinUI.Behaviors; @@ -38,11 +39,11 @@ public partial class NewVersionViewModel : ObservableValidator [ObservableProperty] [NotifyDataErrorInfo] [NotifyPropertyChangedFor(nameof(SecretNameError))] - [Length(1, 127, ErrorMessage = "The field {0} must be between {1} and {2} characters long.")] - [RegularExpression(@"^[a-zA-Z0-9\-]+$", ErrorMessage = "The field {0} is not a valid name")] + [Length(1, 127, ErrorMessageResourceType = typeof(Strings.Resources), ErrorMessageResourceName = "SecretNameErrorMessage")] + [RegularExpression(@"^[a-zA-Z0-9\-]+$", ErrorMessageResourceType = typeof(Strings.Resources), ErrorMessageResourceName = "SecretNameRegularExpressionErrorMessage")] public partial string SecretName { get; set; } = ""; - [Required] + [Required(ErrorMessageResourceType = typeof(Strings.Resources), ErrorMessageResourceName = "SecretValueRequiredErrorMessage")] [ObservableProperty] [NotifyDataErrorInfo] [NotifyPropertyChangedFor(nameof(SecretValueError))] diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/StatusBarViewModel.cs b/src/uno/AzureKeyVaultStudio/UserControls/ViewModels/StatusBarViewModel.cs similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/StatusBarViewModel.cs rename to src/uno/AzureKeyVaultStudio/UserControls/ViewModels/StatusBarViewModel.cs diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Validations/SecretNameValidationAttribute.cs b/src/uno/AzureKeyVaultStudio/Validations/SecretNameValidationAttribute.cs similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Validations/SecretNameValidationAttribute.cs rename to src/uno/AzureKeyVaultStudio/Validations/SecretNameValidationAttribute.cs diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/app.manifest b/src/uno/AzureKeyVaultStudio/app.manifest similarity index 100% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/app.manifest rename to src/uno/AzureKeyVaultStudio/app.manifest diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/appsettings.development.json b/src/uno/AzureKeyVaultStudio/appsettings.development.json similarity index 95% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/appsettings.development.json rename to src/uno/AzureKeyVaultStudio/appsettings.development.json index 337d3ae2..0f5b6179 100644 --- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/appsettings.development.json +++ b/src/uno/AzureKeyVaultStudio/appsettings.development.json @@ -13,7 +13,8 @@ "en-US", "es", "fr", - "pt-BR" + "pt-BR", + "de" ] } } diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/appsettings.json b/src/uno/AzureKeyVaultStudio/appsettings.json similarity index 95% rename from src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/appsettings.json rename to src/uno/AzureKeyVaultStudio/appsettings.json index 9164497f..8656dab6 100644 --- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/appsettings.json +++ b/src/uno/AzureKeyVaultStudio/appsettings.json @@ -13,7 +13,8 @@ "en-US", "es", "fr", - "pt-BR" + "pt-BR", + "de" ] } } diff --git a/src/uno/AzureKeyVaultStudio/global.json b/src/uno/AzureKeyVaultStudio/global.json deleted file mode 100644 index 1abf1149..00000000 --- a/src/uno/AzureKeyVaultStudio/global.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information. - "msbuild-sdks": { - "Uno.Sdk": "6.6.0-dev.142" - }, - "sdk": { - "allowPrerelease": false - } -} diff --git a/src/uno/AzureKeyVaultStudio/icon-iOS-Default-1024x1024@1x.png b/src/uno/AzureKeyVaultStudio/icon-iOS-Default-1024x1024@1x.png deleted file mode 100644 index 9bc8f43f..00000000 Binary files a/src/uno/AzureKeyVaultStudio/icon-iOS-Default-1024x1024@1x.png and /dev/null differ diff --git a/src/uno/AzureKeyVaultStudio/msbuild.ps1 b/src/uno/AzureKeyVaultStudio/msbuild.ps1 new file mode 100644 index 00000000..8073a84e --- /dev/null +++ b/src/uno/AzureKeyVaultStudio/msbuild.ps1 @@ -0,0 +1,16 @@ + +param( + [string]$BuildNumber = '2.1.1.0' +) + +msbuild .\AzureKeyVaultStudio.csproj /t:Restore,Build /r /p:TargetFramework='net10.0-windows10.0.26100' /p:Configuration=Release /p:Platform=x64 /p:GenerateAppxPackageOnBuild=true /p:AppxBundle=Never /p:UapAppxPackageBuildMode=StoreUpload /p:AppxManifestIdentityVersion=$BuildNumber /p:AppxPackageDir="C:\temp\output\$BuildNumber"; + +return + +msbuild .\AzureKeyVaultStudio.csproj /t:Restore,Build /r /p:TargetFramework='net10.0-windows10.0.26100' /p:Configuration=Release /p:Platform=x86 /p:GenerateAppxPackageOnBuild=true /p:AppxBundle=Never /p:UapAppxPackageBuildMode=StoreUpload /p:AppxManifestIdentityVersion=$BuildNumber /p:AppxPackageDir="C:\temp\output\$BuildNumber"; + + + + + +msbuild .\AzureKeyVaultStudio.csproj /t:Restore,Build /r /p:TargetFramework='net10.0-windows10.0.26100' /p:Configuration=Release /p:Platform=arm64 /p:GenerateAppxPackageOnBuild=true /p:AppxBundle=Never /p:UapAppxPackageBuildMode=StoreUpload /p:AppxManifestIdentityVersion=$BuildNumber /p:AppxPackageDir="C:\temp\output\$BuildNumber"; diff --git a/src/uno/Directory.Packages.props b/src/uno/Directory.Packages.props index 2dcede3f..da250a68 100644 --- a/src/uno/Directory.Packages.props +++ b/src/uno/Directory.Packages.props @@ -8,18 +8,19 @@ + - + - - + + - + - - + + @@ -31,13 +32,13 @@ - + + - - + \ No newline at end of file diff --git a/src/uno/global.json b/src/uno/global.json index d60c3f3a..3c7e973e 100644 --- a/src/uno/global.json +++ b/src/uno/global.json @@ -1,7 +1,7 @@ { // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information. "msbuild-sdks": { - "Uno.Sdk": "6.6.0-dev.180" + "Uno.Sdk": "6.6.0-dev.232" }, "sdk": { "allowPrerelease": false