diff --git a/.github/workflows/DevHome-CI.yml b/.github/workflows/DevHome-CI.yml index e792bffb6e..0dc99c78a4 100644 --- a/.github/workflows/DevHome-CI.yml +++ b/.github/workflows/DevHome-CI.yml @@ -62,10 +62,10 @@ jobs: cmd /c "$env:VSDevCmd" "&" msbuild -t:restore /m /p:Configuration=Release,Platform=${{ matrix.platform }} DevHome.sln - name: Build_SDK - run: cmd /c "$env:VSDevCmd" "&" msbuild /m /p:Configuration=Release,Platform=${{ matrix.platform }} extensionsdk\\DevHomeSDK.sln + run: cmd /c "$env:VSDevCmd" "&" msbuild /p:Configuration=Release,Platform=${{ matrix.platform }} extensionsdk\\DevHomeSDK.sln - name: Build_DevHome - run: cmd /c "$env:VSDevCmd" "&" msbuild /m /p:Configuration=${{ matrix.configuration }},Platform=${{ matrix.platform }} DevHome.sln + run: cmd /c "$env:VSDevCmd" "&" msbuild /p:Configuration=${{ matrix.configuration }},Platform=${{ matrix.platform }} DevHome.sln - name: Find vstest.console.exe if: ${{ matrix.platform != 'arm64' }} diff --git a/CoreWidgetProvider/CoreWidgetProvider.csproj b/CoreWidgetProvider/CoreWidgetProvider.csproj index 6f2372f710..bcfbb77c0f 100644 --- a/CoreWidgetProvider/CoreWidgetProvider.csproj +++ b/CoreWidgetProvider/CoreWidgetProvider.csproj @@ -1,4 +1,5 @@  + Exe @@ -7,10 +8,8 @@ - net6.0-windows10.0.22000.0 enable enable - 10.0.17763.0 false x86;x64;arm64 win10-x86;win10-x64;win10-arm64 diff --git a/Directory.Build.props b/Directory.Build.props index 83026353fc..ed2c0f224e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -13,6 +13,7 @@ Recommended $(Platform) + + + + net6.0-windows10.0.22000.0 + 10.0.17763.0 + + \ No newline at end of file diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index 880fa70bd1..04f8ed4c24 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -21,7 +21,7 @@ parameters: variables: # MSIXVersion's second part should always be odd to account for stub app's version - MSIXVersion: '0.701' + MSIXVersion: '0.801' VersionOfSDK: '0.100' solution: '**/DevHome.sln' appxPackageDir: 'AppxPackages' @@ -172,6 +172,7 @@ extends: authKey: $(TouchdownAppKey) resourceFilePath: | **\en-US\*.resw + **\en-US\PDP.xml localizationTarget: false appendRelativeDir: true pseudoSetting: Included @@ -185,6 +186,10 @@ extends: $Files = Get-ChildItem . -R -Filter 'Resources.resw' | ? FullName -Like '*en-US\*\Resources.resw' $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore } + + $Files = Get-ChildItem . -R -Filter 'PDP.xml' | ? FullName -Like '*en-US\*\PDP.xml' + + $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore } pwsh: true - task: PowerShell@2 @@ -483,6 +488,31 @@ extends: artifactName: MsixBundle_Release targetPath: StorePublish + - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@1 + displayName: Download and Use Localization Files + condition: eq(variables['EnableLocalization'], 'true') + retryCountOnTaskFailure: 2 + inputs: + teamId: 71220 + authId: $(TouchdownAppId) + authKey: $(TouchdownAppKey) + resourceFilePath: | + **\en-US\PDP.xml + localizationTarget: false + appendRelativeDir: true + pseudoSetting: Included + + - task: PowerShell@2 + displayName: Move Loc files one level up + condition: eq(variables['EnableLocalization'], 'true') + inputs: + targetType: inline + script: >- + $Files = Get-ChildItem . -R -Filter 'PDP.xml' | ? FullName -Like '*en-US\*\PDP.xml' + + $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore } + pwsh: true + - task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@2 displayName: 'Create Staging StoreBroker Package' condition: eq(variables['BuildingBranch'], 'staging') diff --git a/build/scripts/CreateBuildInfo.ps1 b/build/scripts/CreateBuildInfo.ps1 index bc75de2266..209e881820 100644 --- a/build/scripts/CreateBuildInfo.ps1 +++ b/build/scripts/CreateBuildInfo.ps1 @@ -6,7 +6,7 @@ Param( ) $Major = "0" -$Minor = "7" +$Minor = "8" $Patch = "99" # default to 99 for local builds $versionSplit = $Version.Split("."); diff --git a/build/store/canary/PDPs/de-DE/PDP.xml b/build/store/canary/PDPs/de-DE/PDP.xml deleted file mode 100644 index bd09d2416d..0000000000 --- a/build/store/canary/PDPs/de-DE/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - Dev Home ist ein Kontrollzentrum, das die Möglichkeit bietet, alle Ihre Workflows und Codierungsaufgaben an einem Ort zu verfolgen. Es verfügt über ein optimiertes Setup-Tool, mit dem Sie Apps und Pakete an einem zentralen Ort installieren können, Erweiterungen, mit denen Sie eine Verbindung zu Ihren Entwicklerkonten herstellen können (z. B. GitHub), und ein anpassbares Dashboard mit einer Vielzahl von entwicklerorientierten Widgets, um Ihnen die benötigten Informationen direkt zur Hand zu geben. - -Dies ist ein Open-Source-Projekt und wir freuen uns über die Beteiligung der Community. Um teilzunehmen, besuchen Sie bitte https://github.com/microsoft/devhome - - - - - - - - - - - - - - - - - - - - - - Weitere Informationen finden Sie auf unserer GitHub-Releases-Seite. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Setup-Tool für die Maschinenkonfiguration - - Anpassbares Dashboard - - Entwickler-Widgets - - GitHub-Integration - - Erweiterungen - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/canary/PDPs/es-ES/PDP.xml b/build/store/canary/PDPs/es-ES/PDP.xml deleted file mode 100644 index c94e91e9b5..0000000000 --- a/build/store/canary/PDPs/es-ES/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - Dev Home es un centro de control que proporciona la capacidad de realizar un seguimiento de todos sus flujos de trabajo y tareas de codificación en un solo lugar. Cuenta con una herramienta de configuración optimizada que le permite instalar aplicaciones y paquetes en una ubicación centralizada, extensiones que le permiten conectarse a sus cuentas de desarrollador (como GitHub) y un panel personalizable con una variedad de widgets centrados en el desarrollador, para brindarle la información que necesita al alcance de su mano. - -Este es un proyecto de código abierto y damos la bienvenida a la participación de la comunidad. Para participar, por favor visite https://github.com/microsoft/devhome - - - - - - - - - - - - - - - - - - - - - - Consulte nuestra página de versiones de GitHub para obtener detalles adicionales. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Herramienta de configuración de la máquina - - Panel personalizable - - Widgets para desarrolladores - - Integración con GitHub - - Extensiones - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/canary/PDPs/fr-FR/PDP.xml b/build/store/canary/PDPs/fr-FR/PDP.xml deleted file mode 100644 index a8799bf684..0000000000 --- a/build/store/canary/PDPs/fr-FR/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - Dev Home est un centre de contrôle offrant la possibilité de suivre tous vos flux de travail et tâches de codage en un seul endroit. Il dispose d’un outil de configuration simplifié qui vous permet d’installer des applications et des packages dans un emplacement centralisé, d’extensions qui vous permettent de vous connecter à vos comptes de développeur (tels que GitHub) et d’un tableau de bord personnalisable avec une variété de widgets axés sur les développeurs, pour vous donner les informations dont vous avez besoin à portée de main. - -Il s’agit d’un projet open source et nous accueillons la participation de la communauté. Pour participer, veuillez visiter https://github.com/microsoft/devhome - - - - - - - - - - - - - - - - - - - - - - Veuillez consulter notre page de versions GitHub pour plus de détails. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Outil de configuration de la machine - - Tableau de bord personnalisable - - Widgets de développeur - - Intégration GitHub - - Extensions - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/canary/PDPs/it-IT/PDP.xml b/build/store/canary/PDPs/it-IT/PDP.xml deleted file mode 100644 index b612900414..0000000000 --- a/build/store/canary/PDPs/it-IT/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - Dev Home è un centro di controllo che offre la possibilità di tenere traccia di tutti i flussi di lavoro e delle attività di codifica in un unico posto. È dotato di uno strumento di configurazione semplificato che ti consente di installare app e pacchetti in una posizione centralizzata, estensioni che ti consentono di connetterti ai tuoi account sviluppatore (come GitHub) e una dashboard personalizzabile con una varietà di widget incentrati sugli sviluppatori, per darti le informazioni di cui hai bisogno a portata di mano. - -Questo è un progetto open source e accogliamo con favore la partecipazione della comunità. Per partecipare, visita https://github.com/microsoft/devhome - - - - - - - - - - - - - - - - - - - - - - Per ulteriori dettagli, consulta la nostra pagina delle versioni di GitHub. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Strumento di configurazione della macchina - - Dashboard personalizzabile - - Widget per sviluppatori - - Integrazione con GitHub - - Estensioni - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/canary/PDPs/ja-JP/PDP.xml b/build/store/canary/PDPs/ja-JP/PDP.xml deleted file mode 100644 index 0f3cc6ffaf..0000000000 --- a/build/store/canary/PDPs/ja-JP/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - Dev Homeは、すべてのワークフローとコーディングタスクを1か所で追跡する機能を提供するコントロールセンターです。アプリやパッケージを一元的にインストールできる合理化されたセットアップツール、開発者アカウント(GitHubなど)に接続できる拡張機能、開発者向けのさまざまなウィジェットを備えたカスタマイズ可能なダッシュボードを備えており、必要な情報をすぐに利用できます。 - -これはオープンソースプロジェクトであり、コミュニティの参加を歓迎します。参加するには、https://github.com/microsoft/devhome にアクセスしてください - - - - - - - - - - - - - - - - - - - - - - 詳細については、GitHub リリースのページを参照してください。 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - マシン構成セットアップ ツール - - カスタマイズ可能なダッシュボード - - 開発者ウィジェット - - GitHub インテグレーション - - 拡張 機能 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/canary/PDPs/ko-KR/PDP.xml b/build/store/canary/PDPs/ko-KR/PDP.xml deleted file mode 100644 index 053453afa2..0000000000 --- a/build/store/canary/PDPs/ko-KR/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - Dev Home은 모든 워크플로와 코딩 작업을 한 곳에서 추적할 수 있는 기능을 제공하는 제어 센터입니다. 중앙 위치에 앱과 패키지를 설치할 수 있는 간소화된 설정 도구, 개발자 계정(예: GitHub)에 연결할 수 있는 확장 프로그램, 다양한 개발자 중심 위젯이 포함된 사용자 지정 가능한 대시보드를 제공하여 필요한 정보를 손쉽게 얻을 수 있습니다. - -이것은 오픈 소스 프로젝트이며 커뮤니티 참여를 환영합니다. 참여하려면 https://github.com/microsoft/devhome 방문하십시오. - - - - - - - - - - - - - - - - - - - - - - 자세한 내용은 GitHub 릴리스 페이지를 참조하세요. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 기계 구성 설정 도구 - - 사용자 정의 가능한 대시보드 - - 개발자 위젯 - - GitHub 통합 - - 확장 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/canary/PDPs/pt-BR/PDP.xml b/build/store/canary/PDPs/pt-BR/PDP.xml deleted file mode 100644 index a21b604748..0000000000 --- a/build/store/canary/PDPs/pt-BR/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - O Dev Home é um centro de controle que oferece a capacidade de rastrear todos os seus fluxos de trabalho e tarefas de codificação em um só lugar. Ele possui uma ferramenta de configuração simplificada que permite que você instale aplicativos e pacotes em um local centralizado, extensões que permitem que você se conecte às suas contas de desenvolvedor (como o GitHub) e um painel personalizável com uma variedade de widgets focados no desenvolvedor, para fornecer as informações que você precisa na ponta dos dedos. - -Este é um projeto de código aberto e agradecemos a participação da comunidade. Para participar, acesse https://github.com/microsoft/devhome - - - - - - - - - - - - - - - - - - - - - - Consulte nossa página de lançamentos do GitHub para obter detalhes adicionais. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ferramenta de configuração da máquina - - Painel personalizável - - Widgets para desenvolvedores - - Integração com o GitHub - - Extensões - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/canary/PDPs/ru-RU/PDP.xml b/build/store/canary/PDPs/ru-RU/PDP.xml deleted file mode 100644 index 54aa372de0..0000000000 --- a/build/store/canary/PDPs/ru-RU/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - Dev Home — это центр управления, предоставляющий возможность отслеживать все ваши рабочие процессы и задачи кодирования в одном месте. Он имеет оптимизированный инструмент настройки, который позволяет вам устанавливать приложения и пакеты в централизованном месте, расширения, которые позволяют вам подключаться к вашим учетным записям разработчиков (например, GitHub), и настраиваемую панель инструментов с различными виджетами, ориентированными на разработчиков, чтобы предоставить вам необходимую информацию прямо у вас под рукой. - -Это проект с открытым исходным кодом, и мы приветствуем участие сообщества. Для участия, пожалуйста, посетите https://github.com/microsoft/devhome - - - - - - - - - - - - - - - - - - - - - - Дополнительные сведения см. на нашей странице выпусков GitHub. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Инструмент настройки конфигурации машины - - Настраиваемая приборная панель - - Виджеты разработчика - - Интеграция с GitHub - - Расширения - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/canary/PDPs/zh-CN/PDP.xml b/build/store/canary/PDPs/zh-CN/PDP.xml deleted file mode 100644 index d45717d902..0000000000 --- a/build/store/canary/PDPs/zh-CN/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - 开发人员主页是一个控制中心，能够在一个位置跟踪所有工作流和编码任务。它具有简化的设置工具，使您能够在集中位置安装应用程序和包，扩展允许您连接到开发人员帐户（例如 GitHub），以及带有各种以开发人员为中心的小部件的可自定义仪表板，为您提供触手可及的信息。 - -这是一个开源项目，我们欢迎社区参与。要参加，请访问 https://github.com/microsoft/devhome - - - - - - - - - - - - - - - - - - - - - - 有关更多详细信息，请参阅我们的 GitHub 发布页面。 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 机器配置设置工具 - - 可定制的仪表板 - - 开发人员小部件 - - GitHub 集成 - - 扩展 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/canary/PDPs/zh-TW/PDP.xml b/build/store/canary/PDPs/zh-TW/PDP.xml deleted file mode 100644 index ff016eafa5..0000000000 --- a/build/store/canary/PDPs/zh-TW/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - 開發人員主頁是一個控制中心，能夠在一個位置跟蹤所有工作流和編碼任務。它具有簡化的設置工具，使您能夠在集中位置安裝應用程式和包，擴展允許您連接到開發人員帳戶（例如 GitHub），以及帶有各種以開發人員為中心的小部件的可自定義儀錶板，為您提供觸手可及的資訊。 - -這是一個開源項目，我們歡迎社區參與。要參加，請訪問 https://github.com/microsoft/devhome - - - - - - - - - - - - - - - - - - - - - - 有關更多詳細資訊，請參閱我們的 GitHub 發佈頁面。 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 機器配置設置工具 - - 可定製的儀錶板 - - 開發人員小部件 - - GitHub 集成 - - 擴展 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/preview/PDPs/de-DE/PDP.xml b/build/store/preview/PDPs/de-DE/PDP.xml deleted file mode 100644 index 329244b779..0000000000 --- a/build/store/preview/PDPs/de-DE/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - Dev Home ist ein Kontrollzentrum, das die Möglichkeit bietet, alle Ihre Workflows und Codierungsaufgaben an einem Ort zu verfolgen. Es verfügt über ein optimiertes Setup-Tool, mit dem Sie Apps und Pakete an einem zentralen Ort installieren können, Erweiterungen, mit denen Sie eine Verbindung zu Ihren Entwicklerkonten herstellen können (z. B. GitHub), und ein anpassbares Dashboard mit einer Vielzahl von entwicklerorientierten Widgets, um Ihnen die benötigten Informationen direkt zur Hand zu geben. - -Dies ist ein Open-Source-Projekt und wir freuen uns über die Beteiligung der Community. Um teilzunehmen, besuchen Sie bitte https://github.com/microsoft/devhome - - - - - - - - - - - - - - - - - - - - - - Weitere Informationen finden Sie auf unserer GitHub-Release-Seite unter https://github.com/microsoft/devhome/releases. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Setup-Tool für die Maschinenkonfiguration - - Anpassbares Dashboard - - Entwickler-Widgets - - GitHub-Integration - - Erweiterungen - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/preview/PDPs/es-ES/PDP.xml b/build/store/preview/PDPs/es-ES/PDP.xml deleted file mode 100644 index 129291e168..0000000000 --- a/build/store/preview/PDPs/es-ES/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - Dev Home es un centro de control que proporciona la capacidad de realizar un seguimiento de todos sus flujos de trabajo y tareas de codificación en un solo lugar. Cuenta con una herramienta de configuración optimizada que le permite instalar aplicaciones y paquetes en una ubicación centralizada, extensiones que le permiten conectarse a sus cuentas de desarrollador (como GitHub) y un panel personalizable con una variedad de widgets centrados en el desarrollador, para brindarle la información que necesita al alcance de su mano. - -Este es un proyecto de código abierto y damos la bienvenida a la participación de la comunidad. Para participar, por favor visite https://github.com/microsoft/devhome - - - - - - - - - - - - - - - - - - - - - - Consulte nuestra página de versiones de GitHub en https://github.com/microsoft/devhome/releases para obtener detalles adicionales. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Herramienta de configuración de la máquina - - Panel personalizable - - Widgets para desarrolladores - - Integración con GitHub - - Extensiones - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/preview/PDPs/fr-FR/PDP.xml b/build/store/preview/PDPs/fr-FR/PDP.xml deleted file mode 100644 index 080ae39d3c..0000000000 --- a/build/store/preview/PDPs/fr-FR/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - Dev Home est un centre de contrôle offrant la possibilité de suivre tous vos flux de travail et tâches de codage en un seul endroit. Il dispose d’un outil de configuration simplifié qui vous permet d’installer des applications et des packages dans un emplacement centralisé, d’extensions qui vous permettent de vous connecter à vos comptes de développeur (tels que GitHub) et d’un tableau de bord personnalisable avec une variété de widgets axés sur les développeurs, pour vous donner les informations dont vous avez besoin à portée de main. - -Il s’agit d’un projet open source et nous accueillons la participation de la communauté. Pour participer, veuillez visiter https://github.com/microsoft/devhome - - - - - - - - - - - - - - - - - - - - - - Veuillez consulter notre page de versions GitHub à https://github.com/microsoft/devhome/releases pour plus de détails. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Outil de configuration de la machine - - Tableau de bord personnalisable - - Widgets de développeur - - Intégration GitHub - - Extensions - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/preview/PDPs/it-IT/PDP.xml b/build/store/preview/PDPs/it-IT/PDP.xml deleted file mode 100644 index 7536ea9676..0000000000 --- a/build/store/preview/PDPs/it-IT/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - Dev Home è un centro di controllo che offre la possibilità di tenere traccia di tutti i flussi di lavoro e delle attività di codifica in un unico posto. È dotato di uno strumento di configurazione semplificato che ti consente di installare app e pacchetti in una posizione centralizzata, estensioni che ti consentono di connetterti ai tuoi account sviluppatore (come GitHub) e una dashboard personalizzabile con una varietà di widget incentrati sugli sviluppatori, per darti le informazioni di cui hai bisogno a portata di mano. - -Questo è un progetto open source e accogliamo con favore la partecipazione della comunità. Per partecipare, visita https://github.com/microsoft/devhome - - - - - - - - - - - - - - - - - - - - - - Per ulteriori dettagli, consulta la nostra pagina delle versioni di GitHub all'indirizzo https://github.com/microsoft/devhome/releases. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Strumento di configurazione della macchina - - Dashboard personalizzabile - - Widget per sviluppatori - - Integrazione con GitHub - - Estensioni - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/preview/PDPs/ja-JP/PDP.xml b/build/store/preview/PDPs/ja-JP/PDP.xml deleted file mode 100644 index 9060682ccf..0000000000 --- a/build/store/preview/PDPs/ja-JP/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - Dev Homeは、すべてのワークフローとコーディングタスクを1か所で追跡する機能を提供するコントロールセンターです。アプリやパッケージを一元的にインストールできる合理化されたセットアップツール、開発者アカウント(GitHubなど)に接続できる拡張機能、開発者向けのさまざまなウィジェットを備えたカスタマイズ可能なダッシュボードを備えており、必要な情報をすぐに利用できます。 - -これはオープンソースプロジェクトであり、コミュニティの参加を歓迎します。参加するには、https://github.com/microsoft/devhome にアクセスしてください - - - - - - - - - - - - - - - - - - - - - - 詳細については、https://github.com/microsoft/devhome/releases の GitHub リリース ページを参照してください。 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - マシン構成セットアップ ツール - - カスタマイズ可能なダッシュボード - - 開発者ウィジェット - - GitHub インテグレーション - - 拡張 機能 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/preview/PDPs/ko-KR/PDP.xml b/build/store/preview/PDPs/ko-KR/PDP.xml deleted file mode 100644 index 8212855eda..0000000000 --- a/build/store/preview/PDPs/ko-KR/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - Dev Home은 모든 워크플로와 코딩 작업을 한 곳에서 추적할 수 있는 기능을 제공하는 제어 센터입니다. 중앙 위치에 앱과 패키지를 설치할 수 있는 간소화된 설정 도구, 개발자 계정(예: GitHub)에 연결할 수 있는 확장 프로그램, 다양한 개발자 중심 위젯이 포함된 사용자 지정 가능한 대시보드를 제공하여 필요한 정보를 손쉽게 얻을 수 있습니다. - -이것은 오픈 소스 프로젝트이며 커뮤니티 참여를 환영합니다. 참여하려면 https://github.com/microsoft/devhome 방문하십시오. - - - - - - - - - - - - - - - - - - - - - - 자세한 내용은 https://github.com/microsoft/devhome/releases 의 GitHub 릴리스 페이지를 참조하세요. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 기계 구성 설정 도구 - - 사용자 정의 가능한 대시보드 - - 개발자 위젯 - - GitHub 통합 - - 확장 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/preview/PDPs/pt-BR/PDP.xml b/build/store/preview/PDPs/pt-BR/PDP.xml deleted file mode 100644 index fc1be42e12..0000000000 --- a/build/store/preview/PDPs/pt-BR/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - O Dev Home é um centro de controle que oferece a capacidade de rastrear todos os seus fluxos de trabalho e tarefas de codificação em um só lugar. Ele possui uma ferramenta de configuração simplificada que permite que você instale aplicativos e pacotes em um local centralizado, extensões que permitem que você se conecte às suas contas de desenvolvedor (como o GitHub) e um painel personalizável com uma variedade de widgets focados no desenvolvedor, para fornecer as informações que você precisa na ponta dos dedos. - -Este é um projeto de código aberto e agradecemos a participação da comunidade. Para participar, acesse https://github.com/microsoft/devhome - - - - - - - - - - - - - - - - - - - - - - Consulte nossa página de lançamentos do GitHub em https://github.com/microsoft/devhome/releases para obter detalhes adicionais. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ferramenta de configuração da máquina - - Painel personalizável - - Widgets para desenvolvedores - - Integração com o GitHub - - Extensões - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/preview/PDPs/ru-RU/PDP.xml b/build/store/preview/PDPs/ru-RU/PDP.xml deleted file mode 100644 index 40ec944c47..0000000000 --- a/build/store/preview/PDPs/ru-RU/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - Dev Home — это центр управления, предоставляющий возможность отслеживать все ваши рабочие процессы и задачи кодирования в одном месте. Он имеет оптимизированный инструмент настройки, который позволяет вам устанавливать приложения и пакеты в централизованном месте, расширения, которые позволяют вам подключаться к вашим учетным записям разработчиков (например, GitHub), и настраиваемую панель инструментов с различными виджетами, ориентированными на разработчиков, чтобы предоставить вам необходимую информацию прямо у вас под рукой. - -Это проект с открытым исходным кодом, и мы приветствуем участие сообщества. Для участия, пожалуйста, посетите https://github.com/microsoft/devhome - - - - - - - - - - - - - - - - - - - - - - Дополнительные сведения см. на нашей странице выпусков GitHub по адресу https://github.com/microsoft/devhome/releases. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Инструмент настройки конфигурации машины - - Настраиваемая приборная панель - - Виджеты разработчика - - Интеграция с GitHub - - Расширения - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/preview/PDPs/zh-CN/PDP.xml b/build/store/preview/PDPs/zh-CN/PDP.xml deleted file mode 100644 index 5fcc3bb0cd..0000000000 --- a/build/store/preview/PDPs/zh-CN/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - 开发人员主页是一个控制中心，能够在一个位置跟踪所有工作流和编码任务。它具有简化的设置工具，使您能够在集中位置安装应用程序和包，扩展允许您连接到开发人员帐户（例如 GitHub），以及带有各种以开发人员为中心的小部件的可自定义仪表板，为您提供触手可及的信息。 - -这是一个开源项目，我们欢迎社区参与。要参加，请访问 https://github.com/microsoft/devhome - - - - - - - - - - - - - - - - - - - - - - 有关更多详细信息，请参阅我们的 GitHub 发布页面 https://github.com/microsoft/devhome/releases。 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 机器配置设置工具 - - 可定制的仪表板 - - 开发人员小部件 - - GitHub 集成 - - 扩展 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/build/store/preview/PDPs/zh-TW/PDP.xml b/build/store/preview/PDPs/zh-TW/PDP.xml deleted file mode 100644 index e8dd9e6fe3..0000000000 --- a/build/store/preview/PDPs/zh-TW/PDP.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - Dev - - Home - - DevHome - - Dev Home - - Developer Home - - - - - - - - - 開發人員主頁是一個控制中心，能夠在一個位置跟蹤所有工作流和編碼任務。它具有簡化的設置工具，使您能夠在集中位置安裝應用程式和包，擴展允許您連接到開發人員帳戶（例如 GitHub），以及帶有各種以開發人員為中心的小部件的可自定義儀錶板，為您提供觸手可及的資訊。 - -這是一個開源項目，我們歡迎社區參與。要參加，請訪問 https://github.com/microsoft/devhome - - - - - - - - - - - - - - - - - - - - - - 有關更多詳細資訊，請參閱我們的 GitHub 發佈頁面 https://github.com/microsoft/devhome/releases。 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 機器配置設置工具 - - 可定製的儀錶板 - - 開發人員小部件 - - GitHub 集成 - - 擴展 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) Microsoft Corporation - - - - - https://github.com/microsoft/devhome - - https://github.com/microsoft/devhome/issues/new - - https://go.microsoft.com/fwlink/?LinkID=521839 - diff --git a/common/DevHome.Common.csproj b/common/DevHome.Common.csproj index 3a906d8279..91feb7f84e 100644 --- a/common/DevHome.Common.csproj +++ b/common/DevHome.Common.csproj @@ -1,7 +1,6 @@  + - net6.0-windows10.0.22000.0 - 10.0.17763.0 DevHome.Common x86;x64;arm64 win10-x86;win10-x64;win10-arm64 @@ -31,7 +30,7 @@ - + diff --git a/common/Strings/en-us/Resources.resw b/common/Strings/en-us/Resources.resw index 1d8c603947..680accc2eb 100644 --- a/common/Strings/en-us/Resources.resw +++ b/common/Strings/en-us/Resources.resw @@ -62,4 +62,8 @@ Close Name of the button that hides the banner + + Close + Name of the button that closes a view + \ No newline at end of file diff --git a/common/TelemetryEvents/NavigationViewItemEvent.cs b/common/TelemetryEvents/NavigationViewItemEvent.cs index 2393e40554..a79171dafc 100644 --- a/common/TelemetryEvents/NavigationViewItemEvent.cs +++ b/common/TelemetryEvents/NavigationViewItemEvent.cs @@ -19,9 +19,15 @@ public string NavigationViewTitle get; } - public NavigationViewItemEvent(string navigationViewTitle) + public string PreviousViewTitle + { + get; + } + + public NavigationViewItemEvent(string navigationViewTitle, string previousViewTitle) { NavigationViewTitle = navigationViewTitle; + PreviousViewTitle = previousViewTitle; } public override void ReplaceSensitiveStrings(Func replaceSensitiveStrings) diff --git a/common/TelemetryEvents/SetupFlow/RepoTool/ExtensionEvent.cs b/common/TelemetryEvents/SetupFlow/RepoTool/ExtensionEvent.cs index 77e7969fe5..039162c2b9 100644 --- a/common/TelemetryEvents/SetupFlow/RepoTool/ExtensionEvent.cs +++ b/common/TelemetryEvents/SetupFlow/RepoTool/ExtensionEvent.cs @@ -12,7 +12,7 @@ namespace DevHome.Common.TelemetryEvents.SetupFlow; [EventData] public class ExtensionEvent : EventBase { - public override PartA_PrivTags PartA_PrivTags => PrivTags.ProductAndServiceUsage; + public override PartA_PrivTags PartA_PrivTags => PrivTags.ProductAndServicePerformance; public int NumberOfProviders { diff --git a/common/TelemetryEvents/SetupFlow/RepoTool/RepoDialog/GetReposEvent.cs b/common/TelemetryEvents/SetupFlow/RepoTool/RepoDialog/GetReposEvent.cs index 219b065f90..a08bb245e8 100644 --- a/common/TelemetryEvents/SetupFlow/RepoTool/RepoDialog/GetReposEvent.cs +++ b/common/TelemetryEvents/SetupFlow/RepoTool/RepoDialog/GetReposEvent.cs @@ -14,7 +14,7 @@ namespace DevHome.Common.TelemetryEvents.SetupFlow; [EventData] public class GetReposEvent : EventBase { - public override PartA_PrivTags PartA_PrivTags => PrivTags.ProductAndServiceUsage; + public override PartA_PrivTags PartA_PrivTags => PrivTags.ProductAndServicePerformance; public string StageName { get; } diff --git a/common/TelemetryEvents/SetupFlow/RepoTool/RepoDialog/RepoDialogGetAccountEvent.cs b/common/TelemetryEvents/SetupFlow/RepoTool/RepoDialog/RepoDialogGetAccountEvent.cs index 3b31799d1e..60d2c9e7a9 100644 --- a/common/TelemetryEvents/SetupFlow/RepoTool/RepoDialog/RepoDialogGetAccountEvent.cs +++ b/common/TelemetryEvents/SetupFlow/RepoTool/RepoDialog/RepoDialogGetAccountEvent.cs @@ -12,7 +12,7 @@ namespace DevHome.Common.TelemetryEvents.SetupFlow; [EventData] public class RepoDialogGetAccountEvent : EventBase { - public override PartA_PrivTags PartA_PrivTags => PrivTags.ProductAndServiceUsage; + public override PartA_PrivTags PartA_PrivTags => PrivTags.ProductAndServicePerformance; public string ProviderName { diff --git a/common/TelemetryEvents/SetupFlow/RepoTool/RepoToolEvent.cs b/common/TelemetryEvents/SetupFlow/RepoTool/RepoToolEvent.cs index e4f4e4623a..f57e317b75 100644 --- a/common/TelemetryEvents/SetupFlow/RepoTool/RepoToolEvent.cs +++ b/common/TelemetryEvents/SetupFlow/RepoTool/RepoToolEvent.cs @@ -12,7 +12,7 @@ namespace DevHome.Common.TelemetryEvents.SetupFlow; [EventData] public class RepoToolEvent : EventBase { - public override PartA_PrivTags PartA_PrivTags => PrivTags.ProductAndServiceUsage; + public override PartA_PrivTags PartA_PrivTags => PrivTags.ProductAndServicePerformance; public string Action { diff --git a/common/TelemetryEvents/SetupFlow/RepoTool/RepoToolFinalReposToAddEvent.cs b/common/TelemetryEvents/SetupFlow/RepoTool/RepoToolFinalReposToAddEvent.cs index 120a0b0535..a0bbf83728 100644 --- a/common/TelemetryEvents/SetupFlow/RepoTool/RepoToolFinalReposToAddEvent.cs +++ b/common/TelemetryEvents/SetupFlow/RepoTool/RepoToolFinalReposToAddEvent.cs @@ -30,7 +30,7 @@ public FinalRepoResult(string providerName, AddKind addKind, CloneLocationKind c [EventData] public class RepoToolFinalReposToAddEvent : EventBase { - public override PartA_PrivTags PartA_PrivTags => PrivTags.ProductAndServiceUsage; + public override PartA_PrivTags PartA_PrivTags => PrivTags.ProductAndServicePerformance; public List FinalAddedRepos { get; } diff --git a/common/Views/CloseButton.xaml b/common/Views/CloseButton.xaml index faabeddf79..fc304e0e75 100644 --- a/common/Views/CloseButton.xaml +++ b/common/Views/CloseButton.xaml @@ -5,6 +5,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" + x:Uid="CloseButton" Style="{StaticResource DefaultButtonStyle}" HorizontalAlignment="Right" VerticalAlignment="Top" @@ -12,7 +13,7 @@ Background="Transparent" Padding="10"> - + diff --git a/logging/DevHome.Logging.csproj b/logging/DevHome.Logging.csproj index 66d3678698..92d60e197b 100644 --- a/logging/DevHome.Logging.csproj +++ b/logging/DevHome.Logging.csproj @@ -1,7 +1,6 @@ - - net6.0-windows10.0.22000.0 - 10.0.17763.0 + + DevHome.Logging x86;x64;arm64 win10-x86;win10-x64;win10-arm64 diff --git a/sampleConfigurations/DscResources/GitDsc/CloneWingetRepository.yaml b/sampleConfigurations/DscResources/GitDsc/CloneWingetRepository.yaml new file mode 100644 index 0000000000..b68f3d4c76 --- /dev/null +++ b/sampleConfigurations/DscResources/GitDsc/CloneWingetRepository.yaml @@ -0,0 +1,32 @@ +# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2 + +######################################################################################## +# This configuration will clone the winget-cli repository to a specified location. # +# PowerShell module: GitDsc (v0.1.3-alpha) # +######################################################################################## + +properties: + resources: + - resource: Microsoft.WinGet.DSC/WinGetPackage + directives: + description: Install Git + allowPrerelease: true + settings: + id: Git.Git + source: winget + - resource: GitDsc/GitClone + directives: + description: Clone the winget-cli repository + allowPrerelease: true + settings: + HttpsUrl: https://github.com/microsoft/winget-cli.git + RootDirectory: '${WingetConfigRoot}/SampleRepos/' + # - resource: GitDsc/GitRemote + # directives: + # description: Add a remote repository to the cloned winget-cli repository. + # allowPrerelease: true + # settings: + # RemoteName: exampleName + # RemoteUrl: https://github.com/exampleName/winget-cli.git + # ProjectDirectory: '${WingetConfigRoot}/SampleRepos/winget-cli' + configurationVersion: 0.2.0 diff --git a/sampleConfigurations/DscResources/Microsoft.Windows.Developer/DisableWindowsSettings.yaml b/sampleConfigurations/DscResources/Microsoft.Windows.Developer/DisableWindowsSettings.yaml new file mode 100644 index 0000000000..86e79aeccd --- /dev/null +++ b/sampleConfigurations/DscResources/Microsoft.Windows.Developer/DisableWindowsSettings.yaml @@ -0,0 +1,56 @@ +# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2 + +########################################################################### +# This configuration will enable or disable various Windows Settings. # +# PowerShell module: Microsoft.Windows.Developer (v0.1.3-alpha) # +########################################################################### + +properties: + resources: + - resource: Microsoft.Windows.Developer/TaskBarAlignment + directives: + description: Set taskbar alignment to left + allowPrerelease: true + settings: + Alignment: Middle # 'Left' + - resource: Microsoft.Windows.Developer/ShowSecondsInClock + directives: + description: Show seconds in clock + allowPrerelease: true + settings: + Ensure: Absent + - resource: Microsoft.Windows.Developer/HideFileExtensions + directives: + description: Hide file extensions + allowPrerelease: true + settings: + Ensure: Absent + - resource: Microsoft.Windows.Developer/ShowTaskViewButton + directives: + description: Show task view button + allowPrerelease: true + settings: + Ensure: Absent + - resource: Microsoft.Windows.Developer/ShowHiddenFiles + directives: + description: Show hidden files + allowPrerelease: true + settings: + Ensure: Absent + - resource: Microsoft.Windows.Developer/HideTaskBarLabels + directives: + description: Never hide task bar labels + allowPrerelease: true + settings: + HideLabels: Always # 'WhenFull', 'Never' + # Use caution when setting `RestartExplorer: true` as this will force explorer to close. + RestartExplorer: true # Required to apply changes + - resource: Microsoft.Windows.Developer/EnableDarkMode + directives: + description: Enable dark mode + allowPrerelease: true + settings: + Ensure: Absent + # Use caution when setting `RestartExplorer: true` as this will force explorer to close. + RestartExplorer: true # Required to apply changes + configurationVersion: 0.2.0 diff --git a/sampleConfigurations/DscResources/Microsoft.Windows.Developer/EnableWindowsSettings.yaml b/sampleConfigurations/DscResources/Microsoft.Windows.Developer/EnableWindowsSettings.yaml new file mode 100644 index 0000000000..5eb16bbb50 --- /dev/null +++ b/sampleConfigurations/DscResources/Microsoft.Windows.Developer/EnableWindowsSettings.yaml @@ -0,0 +1,56 @@ +# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2 + +########################################################################### +# This configuration will enable or disable various Windows Settings. # +# PowerShell module: Microsoft.Windows.Developer (v0.1.3-alpha) # +########################################################################### + +properties: + resources: + - resource: Microsoft.Windows.Developer/TaskBarAlignment + directives: + description: Set taskbar alignment to left + allowPrerelease: true + settings: + Alignment: Left # 'Middle' + - resource: Microsoft.Windows.Developer/ShowSecondsInClock + directives: + description: Show seconds in clock + allowPrerelease: true + settings: + Ensure: Present + - resource: Microsoft.Windows.Developer/HideFileExtensions + directives: + description: Hide file extensions + allowPrerelease: true + settings: + Ensure: Present + - resource: Microsoft.Windows.Developer/ShowTaskViewButton + directives: + description: Show task view button + allowPrerelease: true + settings: + Ensure: Present + - resource: Microsoft.Windows.Developer/ShowHiddenFiles + directives: + description: Show hidden files + allowPrerelease: true + settings: + Ensure: Present + - resource: Microsoft.Windows.Developer/HideTaskBarLabels + directives: + description: Never hide task bar labels + allowPrerelease: true + settings: + HideLabels: Never # 'WhenFull', 'Always' + # Use caution when setting `RestartExplorer: true` as this will force explorer to close. + RestartExplorer: true # Required to apply changes + - resource: Microsoft.Windows.Developer/EnableDarkMode + directives: + description: Enable dark mode + allowPrerelease: true + settings: + Ensure: Present + # Use caution when setting `RestartExplorer: true` as this will force explorer to close. + RestartExplorer: true # Required to apply changes + configurationVersion: 0.2.0 diff --git a/sampleConfigurations/DscResources/Microsoft.WindowsSandbox.DSC/ConfigureSandboxWithWinget.yaml b/sampleConfigurations/DscResources/Microsoft.WindowsSandbox.DSC/ConfigureSandboxWithWinget.yaml new file mode 100644 index 0000000000..93f6132aa8 --- /dev/null +++ b/sampleConfigurations/DscResources/Microsoft.WindowsSandbox.DSC/ConfigureSandboxWithWinget.yaml @@ -0,0 +1,41 @@ +# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2 + +############################################################################### +# Create Windows Sandbox instance with WinGet installed. # +# The Logon command performs the following steps in Windows PowerShell: # +# 1. Install Nuget package provider # +# 2. Install Microsoft.WinGet.Client (0.2.1) PS module from the PS gallery. # +# 3. Set the execution policy to RemoteSigned # +# 4. Run Repair-WingetPackageManager to install App Installer (WinGet). # +############################################################################### + +properties: + resources: + - resource: Microsoft.WindowsSandbox.DSC/WindowsSandbox + directives: + description: Create Windows Sandbox with Winget installed + allowPrerelease: true + settings: + Ensure: Present + #WsbFile: + LogonCommand: > + cmd /c start powershell -NoExit -Command "Write-Host 'Installing NuGet package provider...'; + Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force; + Write-Host `n'Installing Microsoft.WinGet.Client PowerShell module...' `n; + Install-Module Microsoft.WinGet.Client -RequiredVersion 0.2.1 -Repository PSGallery -Force; + Write-Host 'Setting execution policy to remote signed...' `n; + Set-ExecutionPolicy RemoteSigned -Force; + Write-Host 'Running the Repair-WinGetPackageManager cmdlet to install App Installer (WinGet)...' `n; + Repair-WingetPackageManager;" + #HostFolder: + #SandboxFolder: + #ReadOnly: false + #MemoryInMB: 2048 + #vGPU: true + #AudioInput: true + #ClipboardRedirection: true + #Networking: true + #PrinterRedirection: false + #ProtectedClient: false + #VideoInput: true + configurationVersion: 0.2.0 diff --git a/sampleConfigurations/DscResources/README.md b/sampleConfigurations/DscResources/README.md new file mode 100644 index 0000000000..d3e03d508d --- /dev/null +++ b/sampleConfigurations/DscResources/README.md @@ -0,0 +1,18 @@ +## Sample Configurations for Specific DSC Resources + +The sample configurations provided in this directory showcase how to create WinGet configuration files utilizing DSC resources for more specific scenarios. + +### [GitDsc](https://www.powershellgallery.com/packages/GitDsc/0.1.2-alpha) + +Supports cloning a new repository and adding/removing remote connections to other repositories. + +### [Microsoft.WindowsSandbox.DSC](https://www.powershellgallery.com/packages/Microsoft.WindowsSandbox.DSC/0.1.1-alpha) + +Create a new instance of Windows Sandbox by either providing a custom .wsb file or specifying parameters. + +>Note: [Windows Sandbox](https://learn.microsoft.com/windows/security/application-security/application-isolation/windows-sandbox/windows-sandbox-overview#prerequisites) requires Windows 10 Pro or Enterprise, build version 18305 or Windows 11. + +### [Microsoft.Windows.Developer](https://www.powershellgallery.com/packages/Microsoft.Windows.Developer/0.1.3-alpha) + +Modify various Windows Settings such as showing seconds in clock, hiding file extensions, or showing the task view button... + diff --git a/sampleConfigurations/README.md b/sampleConfigurations/README.md index 9dd3c86572..d9892a692a 100644 --- a/sampleConfigurations/README.md +++ b/sampleConfigurations/README.md @@ -1,5 +1,10 @@ ## Using the sample configurations +Download the *.dsc.yaml files to your local system. They can be executed in Dev Home via the "Machine configuration" section. They can also be executed by running `winget configure `. +Several DSC resources may require running in administrator mode. If the configuration is leveraging the [WinGet DSC resource](https://www.powershellgallery.com/packages/Microsoft.WinGet.DSC) to install packages, there are also limitations in some cases specific to the installers that may either require or prohibit installation in administrative context. + + +### GitHub projects Sample configurations have been provided for various GitHub repositories. These configurations ideally should be placed in a `.configurations` folder in the root of the project directory. Some DSC resources may have parameters that allow you to pass in a relative file path. The reserved variable `$(WinGetConfigRoot)` can be used to specify the full path of the configuration file. An example of how to use that variable with a relative file path is shown below: ```yaml @@ -12,4 +17,10 @@ Sample configurations have been provided for various GitHub repositories. These productId: Microsoft.VisualStudio.Product.Community channelId: VisualStudio.17.Release vsConfigFile: '${WinGetConfigRoot}\..\.vsconfig' -``` \ No newline at end of file +``` + +### Learn to Code +The sample configurations in the Windows directory are related to [Windows development paths](https://learn.microsoft.com/windows/dev-environment/#development-paths). + +### Sample DSC Resources +Examples for a few specific DSC Resources are under the [DscResources](./DscResources/) directory. \ No newline at end of file diff --git a/settings/DevHome.Settings/DevHome.Settings.csproj b/settings/DevHome.Settings/DevHome.Settings.csproj index c64a2b1829..798ad88b02 100644 --- a/settings/DevHome.Settings/DevHome.Settings.csproj +++ b/settings/DevHome.Settings/DevHome.Settings.csproj @@ -1,7 +1,6 @@  + - net6.0-windows10.0.22000.0 - 10.0.17763.0 DevHome.Settings x86;x64;arm64 win10-x86;win10-x64;win10-arm64 diff --git a/settings/DevHome.Settings/Strings/en-us/Resources.resw b/settings/DevHome.Settings/Strings/en-us/Resources.resw index 8574af4bd5..dfb89df9ff 100644 --- a/settings/DevHome.Settings/Strings/en-us/Resources.resw +++ b/settings/DevHome.Settings/Strings/en-us/Resources.resw @@ -440,6 +440,18 @@ https://go.microsoft.com/fwlink/?linkid=2236981 This is the microsoft code of conduct link. + + Physical Memory + Label for displaying device's memory + + + Processor Architecture + Label for displaying device's processor architecture + + + Extensions + Label for displaying device's installed extensions + Cancel diff --git a/settings/DevHome.Settings/Views/FeedbackPage.xaml.cs b/settings/DevHome.Settings/Views/FeedbackPage.xaml.cs index 2f8f1de477..845e2ed5e2 100644 --- a/settings/DevHome.Settings/Views/FeedbackPage.xaml.cs +++ b/settings/DevHome.Settings/Views/FeedbackPage.xaml.cs @@ -277,14 +277,16 @@ private string GetPhysicalMemory() var availMemKbToGb = Math.Round(memStatus.ullAvailPhys / ByteSizeGB, 2); var totalMemKbToGb = Math.Round(memStatus.ullTotalPhys / ByteSizeGB, 2); - return "Physical Memory: " + totalMemKbToGb.ToString(cultures) + "GB (" + availMemKbToGb.ToString(cultures) + "GB free)"; + var stringResource = new StringResource("DevHome.Settings/Resources"); + return stringResource.GetLocalized("Settings_Feedback_PhysicalMemory") + ": " + totalMemKbToGb.ToString(cultures) + "GB (" + availMemKbToGb.ToString(cultures) + "GB free)"; } private string GetProcessorArchitecture() { SYSTEM_INFO sysInfo; PInvoke.GetSystemInfo(out sysInfo); - return "Processor Architecture: " + DetermineArchitecture((int)sysInfo.Anonymous.Anonymous.wProcessorArchitecture); + var stringResource = new StringResource("DevHome.Settings/Resources"); + return stringResource.GetLocalized("Settings_Feedback_ProcessorArchitecture") + ": " + DetermineArchitecture((int)sysInfo.Anonymous.Anonymous.wProcessorArchitecture); } private string DetermineArchitecture(int value) @@ -316,7 +318,8 @@ private string GetExtensions() { var extensionService = Application.Current.GetService(); var extensions = extensionService.GetInstalledExtensionsAsync(true).Result; - var extensionsStr = "Extensions: \n"; + var stringResource = new StringResource("DevHome.Settings/Resources"); + var extensionsStr = stringResource.GetLocalized("Settings_Feedback_Extensions") + ": \n"; foreach (var extension in extensions) { extensionsStr += extension.PackageFullName + "\n"; diff --git a/src/DevHome.csproj b/src/DevHome.csproj index 92458e44bc..7d14e7e043 100644 --- a/src/DevHome.csproj +++ b/src/DevHome.csproj @@ -2,9 +2,12 @@ + WinExe - net6.0-windows10.0.22000.0 + + 10.0.22000.0 10.0.22000.0 DevHome diff --git a/src/Package.appxmanifest b/src/Package.appxmanifest index 932d136012..68a866e3b5 100644 --- a/src/Package.appxmanifest +++ b/src/Package.appxmanifest @@ -85,7 +85,7 @@ Microsoft.MicrosoftEdge.Stable_8wekyb3d8bbwe - + @@ -102,7 +102,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -183,7 +183,7 @@ - + @@ -193,7 +193,7 @@ - + @@ -210,7 +210,7 @@ - + diff --git a/src/Services/NavigationViewService.cs b/src/Services/NavigationViewService.cs index 251833def2..513b8b3d23 100644 --- a/src/Services/NavigationViewService.cs +++ b/src/Services/NavigationViewService.cs @@ -68,7 +68,8 @@ private void OnItemInvoked(NavigationView sender, NavigationViewItemInvokedEvent var invokedItem = (string)args.InvokedItem; if (invokedItem != null) { - TelemetryFactory.Get().Log("NavigationView_Clicked", LogLevel.Critical, new NavigationViewItemEvent(invokedItem)); + var currentItem = _navigationService.Frame?.CurrentSourcePageType.Name ?? string.Empty; + TelemetryFactory.Get().Log("NavigationView_Clicked", LogLevel.Critical, new NavigationViewItemEvent(invokedItem, currentItem)); } } diff --git a/src/Strings/en-us/Resources.resw b/src/Strings/en-us/Resources.resw index a9de4d59c9..cbcd898aba 100644 --- a/src/Strings/en-us/Resources.resw +++ b/src/Strings/en-us/Resources.resw @@ -246,4 +246,44 @@ Explore Dev Home extensions Title of extensions card on "whats new" page + + CPU + Short name for the machine's Central Processing Unit. + + + Microsoft System CPU Usage Widget + Description for widget that shows the machine's CPU data. + + + GPU + Short name for the machine's Graphics Processing Unit. + + + Microsoft System GPU Usage Widget + Description for widget that shows the machine's GPU data. + + + Network + Title for widget that displays data about the network the computer is on. + + + Microsoft System Network Usage Widget + Description for widget that shows the machine's network data. + + + Memory + Title for widget that displays how much memory the computer has. + + + Microsoft System Memory Usage Widget + Description for widget that shows the machine's memory data. + + + SSH keychain + Title for widget that displays shortcuts to different SSH connections. + + + Quickly connect into to your favorite servers from your SSH config file + Description for widget that displays shortcuts to different SSH connections. + \ No newline at end of file diff --git a/telemetry/DevHome.Telemetry/DevHome.Telemetry.csproj b/telemetry/DevHome.Telemetry/DevHome.Telemetry.csproj index cbf9973596..3bf0a31c15 100644 --- a/telemetry/DevHome.Telemetry/DevHome.Telemetry.csproj +++ b/telemetry/DevHome.Telemetry/DevHome.Telemetry.csproj @@ -1,7 +1,6 @@ + - net6.0-windows10.0.22000.0 - 10.0.17763.0 DevHome.Telemetry x86;x64;arm64 win10-x86;win10-x64;win10-arm64 diff --git a/test/DevHome.Test.csproj b/test/DevHome.Test.csproj index 4a136d406e..5abc055b33 100644 --- a/test/DevHome.Test.csproj +++ b/test/DevHome.Test.csproj @@ -1,6 +1,6 @@  + - net6.0-windows10.0.22000.0 DevHome.Test x86;x64;arm64 false diff --git a/tools/Dashboard/DevHome.Dashboard.UnitTest/DevHome.Dashboard.UnitTest.csproj b/tools/Dashboard/DevHome.Dashboard.UnitTest/DevHome.Dashboard.UnitTest.csproj index 125d924057..1bdec52d74 100644 --- a/tools/Dashboard/DevHome.Dashboard.UnitTest/DevHome.Dashboard.UnitTest.csproj +++ b/tools/Dashboard/DevHome.Dashboard.UnitTest/DevHome.Dashboard.UnitTest.csproj @@ -1,6 +1,6 @@  + - net6.0-windows10.0.22000.0 Dashboard.Test x86;x64;arm64 false diff --git a/tools/Dashboard/DevHome.Dashboard/Controls/WidgetControl.xaml b/tools/Dashboard/DevHome.Dashboard/Controls/WidgetControl.xaml index e43601a6f4..df6042ff25 100644 --- a/tools/Dashboard/DevHome.Dashboard/Controls/WidgetControl.xaml +++ b/tools/Dashboard/DevHome.Dashboard/Controls/WidgetControl.xaml @@ -50,7 +50,7 @@ FontFamily="{StaticResource SymbolThemeFontFamily}" FontSize="{ThemeResource CaptionTextBlockFontSize}" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,10,16,0" BorderThickness="0" Padding="5" Background="Transparent" - Click="OpenWidgetMenu"> + Click="OpenWidgetMenuAsync"> diff --git a/tools/Dashboard/DevHome.Dashboard/Controls/WidgetControl.xaml.cs b/tools/Dashboard/DevHome.Dashboard/Controls/WidgetControl.xaml.cs index 603745a0ea..04280cafa4 100644 --- a/tools/Dashboard/DevHome.Dashboard/Controls/WidgetControl.xaml.cs +++ b/tools/Dashboard/DevHome.Dashboard/Controls/WidgetControl.xaml.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; using DevHome.Common.Extensions; using DevHome.Dashboard.Helpers; using DevHome.Dashboard.Services; @@ -14,7 +15,6 @@ using Microsoft.UI.Xaml.Controls; using Microsoft.Windows.ApplicationModel.Resources; using Microsoft.Windows.Widgets; -using Microsoft.Windows.Widgets.Hosts; namespace DevHome.Dashboard.Controls; @@ -47,7 +47,7 @@ public WidgetControl() ActualThemeChanged += OnActualThemeChanged; } - private void OpenWidgetMenu(object sender, RoutedEventArgs e) + private async void OpenWidgetMenuAsync(object sender, RoutedEventArgs e) { if (sender as Button is Button widgetMenuButton) { @@ -60,7 +60,7 @@ private void OpenWidgetMenu(object sender, RoutedEventArgs e) { var resourceLoader = new ResourceLoader("DevHome.Dashboard.pri", "DevHome.Dashboard/Resources"); - AddSizesToWidgetMenu(widgetMenuFlyout, widgetViewModel, resourceLoader); + await AddSizesToWidgetMenuAsync(widgetMenuFlyout, widgetViewModel, resourceLoader); widgetMenuFlyout.Items.Add(new MenuFlyoutSeparator()); AddCustomizeToWidgetMenu(widgetMenuFlyout, widgetViewModel, resourceLoader); AddRemoveToWidgetMenu(widgetMenuFlyout, widgetViewModel, resourceLoader); @@ -115,9 +115,10 @@ private async void OnRemoveWidgetClick(object sender, RoutedEventArgs e) } } - private void AddSizesToWidgetMenu(MenuFlyout widgetMenuFlyout, WidgetViewModel widgetViewModel, ResourceLoader resourceLoader) + private async Task AddSizesToWidgetMenuAsync(MenuFlyout widgetMenuFlyout, WidgetViewModel widgetViewModel, ResourceLoader resourceLoader) { - var widgetDefinition = WidgetCatalog.GetDefault().GetWidgetDefinition(widgetViewModel.Widget.DefinitionId); + var widgetCatalog = await Application.Current.GetService().GetWidgetCatalogAsync(); + var widgetDefinition = await Task.Run(() => widgetCatalog.GetWidgetDefinition(widgetViewModel.Widget.DefinitionId)); var capabilities = widgetDefinition.GetWidgetCapabilities(); var sizeMenuItems = new List(); diff --git a/tools/Dashboard/DevHome.Dashboard/DevHome.Dashboard.csproj b/tools/Dashboard/DevHome.Dashboard/DevHome.Dashboard.csproj index 7e83d267fa..53a13a0e34 100644 --- a/tools/Dashboard/DevHome.Dashboard/DevHome.Dashboard.csproj +++ b/tools/Dashboard/DevHome.Dashboard/DevHome.Dashboard.csproj @@ -1,7 +1,6 @@  + - net6.0-windows10.0.22000.0 - 10.0.17763.0 DevHome.Dashboard x86;x64;arm64 win10-x86;win10-x64;win10-arm64 @@ -19,7 +18,7 @@ - + diff --git a/tools/Dashboard/DevHome.Dashboard/Services/IWidgetHostingService.cs b/tools/Dashboard/DevHome.Dashboard/Services/IWidgetHostingService.cs index 4874974627..cdbed78a79 100644 --- a/tools/Dashboard/DevHome.Dashboard/Services/IWidgetHostingService.cs +++ b/tools/Dashboard/DevHome.Dashboard/Services/IWidgetHostingService.cs @@ -1,13 +1,14 @@ // Copyright (c) Microsoft Corporation and Contributors // Licensed under the MIT license. +using System.Threading.Tasks; using Microsoft.Windows.Widgets.Hosts; namespace DevHome.Dashboard.Services; public interface IWidgetHostingService { - public WidgetHost GetWidgetHost(); + public Task GetWidgetHostAsync(); - public WidgetCatalog GetWidgetCatalog(); + public Task GetWidgetCatalogAsync(); } diff --git a/tools/Dashboard/DevHome.Dashboard/Services/WidgetHostingService.cs b/tools/Dashboard/DevHome.Dashboard/Services/WidgetHostingService.cs index 4a46e93229..9946f65f2a 100644 --- a/tools/Dashboard/DevHome.Dashboard/Services/WidgetHostingService.cs +++ b/tools/Dashboard/DevHome.Dashboard/Services/WidgetHostingService.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. using System; +using System.Threading.Tasks; using DevHome.Dashboard.Helpers; using Microsoft.Windows.Widgets.Hosts; @@ -16,13 +17,13 @@ public WidgetHostingService() { } - public WidgetHost GetWidgetHost() + public async Task GetWidgetHostAsync() { if (_widgetHost == null) { try { - _widgetHost = WidgetHost.Register(new WidgetHostContext("BAA93438-9B07-4554-AD09-7ACCD7D4F031")); + _widgetHost = await Task.Run(() => WidgetHost.Register(new WidgetHostContext("BAA93438-9B07-4554-AD09-7ACCD7D4F031"))); } catch (Exception ex) { @@ -33,13 +34,13 @@ public WidgetHost GetWidgetHost() return _widgetHost; } - public WidgetCatalog GetWidgetCatalog() + public async Task GetWidgetCatalogAsync() { if (_widgetCatalog == null) { try { - _widgetCatalog = WidgetCatalog.GetDefault(); + _widgetCatalog = await Task.Run(() => WidgetCatalog.GetDefault()); } catch (Exception ex) { diff --git a/tools/Dashboard/DevHome.Dashboard/Services/WidgetIconService.cs b/tools/Dashboard/DevHome.Dashboard/Services/WidgetIconService.cs index 0df81f815d..a338be6dc1 100644 --- a/tools/Dashboard/DevHome.Dashboard/Services/WidgetIconService.cs +++ b/tools/Dashboard/DevHome.Dashboard/Services/WidgetIconService.cs @@ -38,7 +38,8 @@ public WidgetIconService(WindowEx windowEx, IWidgetHostingService widgetHostingS public async Task CacheAllWidgetIconsAsync() { var cacheTasks = new List(); - var widgetDefinitions = _widgetHostingService.GetWidgetCatalog()!.GetWidgetDefinitions(); + var widgetCatalog = await _widgetHostingService.GetWidgetCatalogAsync(); + var widgetDefinitions = await Task.Run(() => widgetCatalog?.GetWidgetDefinitions()); foreach (var widgetDef in widgetDefinitions ?? Array.Empty()) { var task = AddIconsToCacheAsync(widgetDef); diff --git a/tools/Dashboard/DevHome.Dashboard/Strings/en-us/Resources.resw b/tools/Dashboard/DevHome.Dashboard/Strings/en-us/Resources.resw index 640d997e63..f0375eb23e 100644 --- a/tools/Dashboard/DevHome.Dashboard/Strings/en-us/Resources.resw +++ b/tools/Dashboard/DevHome.Dashboard/Strings/en-us/Resources.resw @@ -86,6 +86,10 @@ Pin Label for button that pins the widget + + Pin + Name of the button that pins the widget + Update Label for button that updates the widget diff --git a/tools/Dashboard/DevHome.Dashboard/Views/AddWidgetDialog.xaml b/tools/Dashboard/DevHome.Dashboard/Views/AddWidgetDialog.xaml index 5f61c437de..32ace0766c 100644 --- a/tools/Dashboard/DevHome.Dashboard/Views/AddWidgetDialog.xaml +++ b/tools/Dashboard/DevHome.Dashboard/Views/AddWidgetDialog.xaml @@ -85,11 +85,12 @@