Merge pull request #723 from WhitewaterFoundry/development

Development
WhitewaterFoundry · Jan 19, 2022 · 2beb206 · 2beb206
2 parents 5ca019c + e9b4610
commit 2beb206
Show file tree

Hide file tree

Showing 11 changed files with 115 additions and 66 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,58 @@
+Existing users can update immediately by running $ pengwin-setup update
+22.1.0:
+* Show a better message in WSL2 when the Virtual Machine Platform Windows feature is not enabled
+* Keep the previous Debian repo for compatibility with packages expecting buster
+* Skip some steps in 00-pengwin.fish for non-interactive sessions
+* Add testing repo with a low priority
+* Change which by command -v in the scripts, due to which is deprecated and slower
+* Change command -v by command -q in fish scripts
+* Add an alias to the wsl command so that you can type wsl --version instead of wsl.exe --version inside Pengwin
+* Remove the version restriction in iproute, due to the latest kernel support the ss -a command without issues in WSL2
+* Improve start menu shortcut generation (short the generated path)
+* dotnet package use the new repo for bullseye
+* Bump Python to 3.10.1 also updated all installation types
+* Fix gopath in go installer
+* Fix MariaDB 10.6 install and improve the overall LAMP installer
+* Show progress ring in profile tab and taskbar in Windows Terminal when updating pengwin-setup and generating start menu shortcuts
+* Install x11-utils as part of VcXsrv installation
+* Fix a bug that breaks XRDP upon SDKMan installation
+* Upgrade .NET installer to 6.0
+* Switch to the newer poetry install script
+* Make the SDKMan install the latest Java by default when using the Java installer in pengwin-setup
+* Upgrade VcXsrv to 1.20.14.0
+
+21.8.0:
+* Improved Start menu icons for Pengwin
+* Fixed HiDPI with GTK in WSLg
+* Upgraded docker version
+* Fixed the cloud cli installer
+* Upgraded Terraform to 1.0.5
+
+21.7.1:
+* Now Pengwin is compatible with XRDP. Installing xrdp and xorgxrdp should work now.
+* Improved high-dpi support in the embedded VcXsrv
+* Fixed the NodeJS NVM (no longer installs N instead)
+* Fixed the MariaDB installer in LAMP. Also, the support for ARM64 was improved.
+* Improved Python PyEnv configs and bump Python version to 3.9.6
+* Upgraded helm and fixed Kubernetes installer
+* Fixed the docker support uninstaller
+
+21.5.5:
+* Enables put notifications so you will receive a message everytime a new Pengwin version is released
+
+21.5.4:
+* Automatically creates an entry with logo in Windows Terminal
+* Add default background and colors to Windows Terminal (you can change them in Settings)
+* In App Settings, it is possible to set Pengwin launch at startup
+* If display scale factor is 200% or more now the mouse cursor will be 64px wide
+
+21.4.1:
+* Updated CMake to version 3.19.1
+* Updated pyenv python to version 3.9.4
+* Fixed a hang with fish and dbus
+* Improved Poetry installer
+* Added Prezto support ZSH installer
+* Do not override DISPLAY variable if it is already defined
+
+21.3.1:
+* Include the latest packages in the image.
diff --git a/DistroLauncher/DistroLauncher.cpp b/DistroLauncher/DistroLauncher.cpp
@@ -95,7 +95,7 @@ HRESULT SetDefaultUser(std::wstring_view userName)
 int RetrieveCurrentTheme()
 {
     DWORD value = 0;
-    DWORD size = sizeof(value);
+    DWORD size = sizeof value;
 
     // ReSharper disable once CppTooWideScope
     const auto status = RegGetValueW(HKEY_CURRENT_USER,
@@ -182,12 +182,12 @@ int wmain(int argc, const wchar_t* argv[])
     }
 
     // Install the distribution if it is not already.
-    const auto installOnly = ((arguments.size() > 0) && (arguments[0] == ARG_INSTALL));
+    const auto installOnly = arguments.size() > 0 && arguments[0] == ARG_INSTALL;
     auto hr = S_OK;
     if (!g_wslApi.WslIsDistributionRegistered())
     {
         // If the "--root" option is specified, do not create a user account.
-        const auto useRoot = ((installOnly) && (arguments.size() > 1) && (arguments[1] == ARG_INSTALL_ROOT));
+        const auto useRoot = installOnly && arguments.size() > 1 && arguments[1] == ARG_INSTALL_ROOT;
         hr = InstallDistribution(!useRoot);
         if (FAILED(hr))
         {
@@ -205,7 +205,7 @@ int wmain(int argc, const wchar_t* argv[])
     }
 
     // Parse the command line arguments.
-    if ((SUCCEEDED(hr)) && (!installOnly))
+    if (SUCCEEDED(hr) && !installOnly)
     {
         // ReSharper disable once StringLiteralTypo
         SyncIcon(L"pengwin");

diff --git a/DistroLauncher/DistroLauncher.vcxproj b/DistroLauncher/DistroLauncher.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
@@ -23,34 +23,34 @@
     <ProjectGuid>{BA627106-E5F7-46EE-B8D7-2D5A760F2FB2}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>DistroLauncher</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>Launcher</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
@@ -187,13 +187,13 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
-</Project>
+</Project>
diff --git a/DistroLauncher/messages.mc b/DistroLauncher/messages.mc
@@ -22,14 +22,14 @@ WslLaunch %1 failed with error: 0x%2!x!
 
 MessageId=1005 SymbolicName=MSG_USAGE
 Language=English
-Launches or configures a Linux distribution.
+Launches or configures Pengwin Linux distribution.
 
 Usage: 
     <no args> 
         Launches the user's default shell in the user's home directory.
 
     install [--root]
-        Install the distribuiton and do not launch the shell when complete.
+        Install the distribution and do not launch the shell when complete.
           --root
               Do not create a user account and leave the default user set to root.
 
@@ -70,7 +70,7 @@ Enter new UNIX username: %0
 MessageId=1010 SymbolicName=MSG_CREATE_USER_PROMPT
 Language=English
 Please create a default Linux user account. The username does not need to match your Windows username.
-For more information visit: https://aka.ms/wslusers
+For more information, visit https://aka.ms/wslusers.
 .
 
 MessageId=1011 SymbolicName=MSG_PRESS_A_KEY
@@ -89,3 +89,8 @@ Language=English
 The distribution installation has become corrupted.
 Please select Reset from App Settings or uninstall and reinstall the app.
 .
+MessageId=1014 SymbolicName=MSG_ENABLE_VIRTUALIZATION
+Language=English
+Please enable the Virtual Machine Platform Windows feature and ensure virtualization is enabled in the BIOS.
+For information, please visit https://aka.ms/enablevirtualization.
+.
diff --git a/DistroLauncher/packages.config b/DistroLauncher/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.210505.3" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.220110.5" targetFramework="native" />
 </packages>
diff --git a/LauncherTests/LauncherTests.vcxproj b/LauncherTests/LauncherTests.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -22,9 +22,9 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{3fba1aee-63df-4490-82ae-74aaab1bfd80}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -56,8 +56,8 @@
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" />
-    <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.5\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.5\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" />
+    <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
   </ImportGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -125,8 +125,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.5\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.5\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
 </Project>
diff --git a/LauncherTests/packages.config b/LauncherTests/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1.3" targetFramework="native" />
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.210505.3" targetFramework="native" />
+  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1.5" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.220110.5" targetFramework="native" />
 </packages>
diff --git a/Pengwin/Package.appxmanifest b/Pengwin/Package.appxmanifest
@@ -11,7 +11,7 @@
   <Identity
     Name="WhitewaterFoundryLtd.Co.16571368D6CFF"
     Publisher="CN=9879127B-9E92-4DE5-9C32-0B1F09F95DCF"
-    Version="21.8.0.0" />
+    Version="22.1.0.0" />
 
   <Properties>
     <DisplayName>Pengwin</DisplayName>

diff --git a/Pengwin/Public/Fragments/pengwin.json b/Pengwin/Public/Fragments/pengwin.json
@@ -2,7 +2,7 @@
   "profiles": [
     {
       "updates": "{7f586916-8357-53d4-bb2b-ca96f639898a}",
-      "commandline": "pengwin.exe",
+      "commandline": "%LOCALAPPDATA%\\Microsoft\\WindowsApps\\pengwin.exe",
       "icon": "%LOCALAPPDATA%\\Packages\\WhitewaterFoundryLtd.Co.16571368D6CFF_kd1vv0z0vy70w\\LocalState\\pengwin.png",
       "name": "Pengwin",
       "acrylicOpacity": 0.9,

diff --git a/PengwinUI/PengwinUI.csproj b/PengwinUI/PengwinUI.csproj
@@ -151,7 +151,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.12</Version>
+      <Version>6.2.13</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Services.Store.Engagement">
       <Version>10.1901.28001</Version>