Merge pull request #1175 from microsoft/staging

Release - 6/20/23
microsoft · Jun 20, 2023 · c69aab5 · c69aab5
2 parents 5912bde + 416647e
commit c69aab5
Show file tree

Hide file tree

Showing 25 changed files with 728 additions and 684 deletions.
diff --git a/.github/workflows/DevHome-CI.yml b/.github/workflows/DevHome-CI.yml
@@ -70,7 +70,7 @@ jobs:
     - name: Find vstest.console.exe
       if: ${{ matrix.platform != 'arm64' }}
       run: |
-        $VSDevTestCmd = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere" -latest -prerelease -products * -find **\TestPlatform\vstest.console.exe
+        $VSDevTestCmd = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere" -latest -prerelease -products * -find Common7\IDE\Extensions\TestPlatform\vstest.console.exe
         if (!$VSDevTestCmd) { exit 1 }
         echo "Using VSDevTestCmd: ${VSDevTestCmd}"
         Add-Content $env:GITHUB_ENV "VSDevTestCmd=$VSDevTestCmd"

diff --git a/build/store/preview/PDPs/de-DE/PDP.xml b/build/store/preview/PDPs/de-DE/PDP.xml
@@ -51,7 +51,7 @@ Dies ist ein Open-Source-Projekt und wir freuen uns über die Beteiligung der Co
     <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
   </DevStudio>
   <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Weitere Informationen finden Sie auf unserer GitHub-Releases-Seite.</ReleaseNotes>
+    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Weitere Informationen finden Sie auf unserer GitHub-Release-Seite unter https://github.com/microsoft/devhome/releases.</ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->
     <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->

diff --git a/build/store/preview/PDPs/en-us/PDP.xml b/build/store/preview/PDPs/en-us/PDP.xml
@@ -51,7 +51,7 @@ This is an open source project and we welcome community participation. To partic
     <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
   </DevStudio>
   <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Please see our GitHub releases page for additional details.</ReleaseNotes>
+    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Please see our GitHub releases page at https://github.com/microsoft/devhome/releases for additional details.</ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->
     <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->

diff --git a/build/store/preview/PDPs/es-ES/PDP.xml b/build/store/preview/PDPs/es-ES/PDP.xml
@@ -51,7 +51,7 @@ Este es un proyecto de código abierto y damos la bienvenida a la participación
     <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
   </DevStudio>
   <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Consulte nuestra página de versiones de GitHub para obtener detalles adicionales.</ReleaseNotes>
+    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Consulte nuestra página de versiones de GitHub en https://github.com/microsoft/devhome/releases para obtener detalles adicionales.</ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->
     <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->

diff --git a/build/store/preview/PDPs/fr-FR/PDP.xml b/build/store/preview/PDPs/fr-FR/PDP.xml
@@ -51,7 +51,7 @@ Il s’agit d’un projet open source et nous accueillons la participation de la
     <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
   </DevStudio>
   <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Veuillez consulter notre page de versions GitHub pour plus de détails.</ReleaseNotes>
+    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Veuillez consulter notre page de versions GitHub à https://github.com/microsoft/devhome/releases pour plus de détails.</ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->
     <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->

diff --git a/build/store/preview/PDPs/it-IT/PDP.xml b/build/store/preview/PDPs/it-IT/PDP.xml
@@ -51,7 +51,7 @@ Questo è un progetto open source e accogliamo con favore la partecipazione dell
     <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
   </DevStudio>
   <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Per ulteriori dettagli, consulta la nostra pagina delle versioni di GitHub.</ReleaseNotes>
+    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Per ulteriori dettagli, consulta la nostra pagina delle versioni di GitHub all'indirizzo https://github.com/microsoft/devhome/releases.</ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->
     <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->

diff --git a/build/store/preview/PDPs/ja-JP/PDP.xml b/build/store/preview/PDPs/ja-JP/PDP.xml
@@ -51,7 +51,7 @@
     <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
   </DevStudio>
   <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->詳細については、GitHub リリースのページを参照してください。</ReleaseNotes>
+    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->詳細については、https://github.com/microsoft/devhome/releases の GitHub リリース ページを参照してください。</ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->
     <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->

diff --git a/build/store/preview/PDPs/ko-KR/PDP.xml b/build/store/preview/PDPs/ko-KR/PDP.xml
@@ -51,7 +51,7 @@
     <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
   </DevStudio>
   <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->자세한 내용은 GitHub 릴리스 페이지를 참조하세요.</ReleaseNotes>
+    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->자세한 내용은 https://github.com/microsoft/devhome/releases 의 GitHub 릴리스 페이지를 참조하세요.</ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->
     <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->

diff --git a/build/store/preview/PDPs/pt-BR/PDP.xml b/build/store/preview/PDPs/pt-BR/PDP.xml
@@ -51,7 +51,7 @@ Este é um projeto de código aberto e agradecemos a participação da comunidad
     <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
   </DevStudio>
   <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Consulte nossa página de lançamentos do GitHub para obter detalhes adicionais.</ReleaseNotes>
+    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Consulte nossa página de lançamentos do GitHub em https://github.com/microsoft/devhome/releases para obter detalhes adicionais.</ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->
     <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->

diff --git a/build/store/preview/PDPs/ru-RU/PDP.xml b/build/store/preview/PDPs/ru-RU/PDP.xml
@@ -51,7 +51,7 @@
     <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
   </DevStudio>
   <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Дополнительные сведения см. на нашей странице выпусков GitHub.</ReleaseNotes>
+    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Дополнительные сведения см. на нашей странице выпусков GitHub по адресу https://github.com/microsoft/devhome/releases.</ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->
     <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->

diff --git a/build/store/preview/PDPs/zh-CN/PDP.xml b/build/store/preview/PDPs/zh-CN/PDP.xml
@@ -51,7 +51,7 @@
     <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
   </DevStudio>
   <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->有关更多详细信息，请参阅我们的 GitHub 发布页面。</ReleaseNotes>
+    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->有关更多详细信息，请参阅我们的 GitHub 发布页面 https://github.com/microsoft/devhome/releases。</ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->
     <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->

diff --git a/build/store/preview/PDPs/zh-TW/PDP.xml b/build/store/preview/PDPs/zh-TW/PDP.xml
@@ -51,7 +51,7 @@
     <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
   </DevStudio>
   <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->有關更多詳細資訊，請參閱我們的 GitHub 發佈頁面。</ReleaseNotes>
+    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->有關更多詳細資訊，請參閱我們的 GitHub 發佈頁面 https://github.com/microsoft/devhome/releases。</ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->
     <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->

diff --git a/settings/DevHome.Settings/DevHome.Settings.csproj b/settings/DevHome.Settings/DevHome.Settings.csproj
@@ -20,6 +20,7 @@
     <None Remove="Views\AboutPage.xaml" />
     <None Remove="Views\AccountsPage.xaml" />
     <None Remove="Views\ExtensionsPage.xaml" />
+    <None Remove="Views\FeedbackPage.xaml" />
     <None Remove="Views\LoginUIDialog.xaml" />
     <None Remove="Views\PreferencesPage.xaml" />
   </ItemGroup>
@@ -28,6 +29,11 @@
     <PackageReference Include="CommunityToolkit.Labs.WinUI.SettingsControls" Version="0.0.14" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
     <PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2" />
+    <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.2.206-beta">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.1" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
   </ItemGroup>
@@ -46,6 +52,9 @@
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="Views\FeedbackPage.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
     <Page Update="Views\LoginUIDialog.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
     </Page>

diff --git a/settings/DevHome.Settings/Extensions/ServiceExtensions.cs b/settings/DevHome.Settings/Extensions/ServiceExtensions.cs
@@ -12,6 +12,8 @@ public static class ServiceExtensions
     public static IServiceCollection AddSettings(this IServiceCollection services, HostBuilderContext context)
     {
         // Project services
+        services.AddTransient<FeedbackViewModel>();
+        services.AddTransient<FeedbackPage>();
         services.AddTransient<SettingsViewModel>();
         services.AddTransient<SettingsPage>();
         services.AddTransient<AboutViewModel>();

diff --git a/settings/DevHome.Settings/NativeMethods.txt b/settings/DevHome.Settings/NativeMethods.txt
@@ -0,0 +1,4 @@
+GetPhysicallyInstalledSystemMemory
+GlobalMemoryStatusEx
+GetSystemInfo
+CoCreateInstance