Add files via upload

builtbybel · Jul 20, 2021 · 6d791e7 · 6d791e7
1 parent 23e6d96
commit 6d791e7
Show file tree

Hide file tree

Showing 19 changed files with 398 additions and 1,237 deletions.
diff --git a/src/RSV.sln b/src/RSV.sln
@@ -5,19 +5,69 @@ VisualStudioVersion = 16.0.31313.79
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RSV", "RSV\RSV.csproj", "{52284F5D-F25D-4D7F-853A-8EBF0ED8F5F0}"
 EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "RSV.Package", "RSV.Package\RSV.Package.wapproj", "{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{52284F5D-F25D-4D7F-853A-8EBF0ED8F5F0}.Debug|Any CPU.ActiveCfg = Release|Any CPU
 		{52284F5D-F25D-4D7F-853A-8EBF0ED8F5F0}.Debug|Any CPU.Build.0 = Release|Any CPU
+		{52284F5D-F25D-4D7F-853A-8EBF0ED8F5F0}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{52284F5D-F25D-4D7F-853A-8EBF0ED8F5F0}.Debug|ARM.Build.0 = Debug|Any CPU
+		{52284F5D-F25D-4D7F-853A-8EBF0ED8F5F0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{52284F5D-F25D-4D7F-853A-8EBF0ED8F5F0}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{52284F5D-F25D-4D7F-853A-8EBF0ED8F5F0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{52284F5D-F25D-4D7F-853A-8EBF0ED8F5F0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{52284F5D-F25D-4D7F-853A-8EBF0ED8F5F0}.Debug|x86.Build.0 = Debug|Any CPU
 		{52284F5D-F25D-4D7F-853A-8EBF0ED8F5F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{52284F5D-F25D-4D7F-853A-8EBF0ED8F5F0}.Release|ARM.ActiveCfg = Release|Any CPU
+		{52284F5D-F25D-4D7F-853A-8EBF0ED8F5F0}.Release|ARM.Build.0 = Release|Any CPU
+		{52284F5D-F25D-4D7F-853A-8EBF0ED8F5F0}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{52284F5D-F25D-4D7F-853A-8EBF0ED8F5F0}.Release|ARM64.Build.0 = Release|Any CPU
 		{52284F5D-F25D-4D7F-853A-8EBF0ED8F5F0}.Release|x64.ActiveCfg = Release|Any CPU
+		{52284F5D-F25D-4D7F-853A-8EBF0ED8F5F0}.Release|x86.ActiveCfg = Release|Any CPU
+		{52284F5D-F25D-4D7F-853A-8EBF0ED8F5F0}.Release|x86.Build.0 = Release|Any CPU
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Debug|ARM.ActiveCfg = Debug|ARM
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Debug|ARM.Build.0 = Debug|ARM
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Debug|ARM.Deploy.0 = Debug|ARM
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Debug|ARM64.Build.0 = Debug|ARM64
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Debug|x64.ActiveCfg = Debug|x64
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Debug|x64.Build.0 = Debug|x64
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Debug|x64.Deploy.0 = Debug|x64
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Debug|x86.ActiveCfg = Debug|x86
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Debug|x86.Build.0 = Debug|x86
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Debug|x86.Deploy.0 = Debug|x86
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Release|ARM.ActiveCfg = Release|ARM
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Release|ARM.Build.0 = Release|ARM
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Release|ARM.Deploy.0 = Release|ARM
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Release|ARM64.ActiveCfg = Release|ARM64
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Release|ARM64.Build.0 = Release|ARM64
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Release|ARM64.Deploy.0 = Release|ARM64
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Release|x64.ActiveCfg = Release|x64
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Release|x64.Build.0 = Release|x64
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Release|x64.Deploy.0 = Release|x64
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Release|x86.ActiveCfg = Release|x86
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Release|x86.Build.0 = Release|x86
+		{26E6B8E6-11C2-4962-8DFE-C8AD2356B317}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/RSV/App.config b/src/RSV/App.config
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
-    </startup>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+  </startup>
+  <runtime>
+    <!-- BEGIN Separate folder for Satellite Assemblies/Localization files  -->
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <probing privatePath="lang" />
+    </assemblyBinding>
+  </runtime>
+  <!-- END   -->
 </configuration>
diff --git a/src/RSV/AppLogo.png b/src/RSV/AppLogo.png
diff --git a/src/RSV/Assessment/Inet.cs b/src/RSV/Assessment/Inet.cs
@@ -1,13 +1,24 @@
-namespace ReadySunValley.Assessment
+using System.Net;
+
+namespace ReadySunValley.Assessment
 {
     public class Inet
     {
-        [System.Runtime.InteropServices.DllImport("wininet.dll")]
-        private extern static bool InternetGetConnectedState(out int Description, int ReservedValue);
-
-        public bool isINet()
+        //Check Internet Connection Function
+        public bool IsInet()
         {
-            return InternetGetConnectedState(out _, 0);
+            try
+            {
+                using (var CheckInternet = new WebClient())
+                using (CheckInternet.OpenRead("http://clients3.google.com/generate_204"))
+                {
+                    return true;
+                }
+            }
+            catch
+            {
+                return false;
+            }
         }
     }
 }
diff --git a/src/RSV/Assessment/OS.cs b/src/RSV/Assessment/OS.cs
@@ -11,7 +11,13 @@ public string GetOS()
         {
             ComputerName = Environment.MachineName;
 
-            return (string)Registry.GetValue("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", "ProductName", "");
+            RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion");
+            int osbuild = Convert.ToInt32(key.GetValue("CurrentBuildNumber"));
+            if (osbuild >= 22000)
+            {
+                return ("Windows 11 aka Sun Valley");
+            }
+            else return (string)Registry.GetValue("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", "ProductName", "");
         }
 
         public string GetVersion()

diff --git a/src/RSV/Helpers/Strings.cs b/src/RSV/Helpers/Strings.cs
@@ -10,11 +10,9 @@ public static class Uri
             public const string GitUpdateRepo = "https://github.com/builtbybel/readysunvalley/releases/tag/";
             public const string GitVersionCheck = "https://raw.githubusercontent.com/builtbybel/readysunvalley/master/appversion.txt";
             public const string GitVersionHint = "https://raw.githubusercontent.com/builtbybel/ReadySunValley/main/changes.txt";
-            public const string GitTestingRelease = "https://github.com/builtbybel/ReadySunValley/issues/20";
             public const string GitReportCommunity = "https://github.com/builtbybel/ReadySunValley/issues/new";
 
             public const string CompareMS = "https://github.com/builtbybel/ReadySunValley/blob/main/assets/rsv-microsoft-requirements.png?raw=true";
-            public const string CompareUtil = "https://github.com/rcmaehl/WhyNotWin11/releases/download/";
             public const string UtilVersionCheck = "https://raw.githubusercontent.com/builtbybel/ReadySunValley/main/utilversion.txt";
 
             public const string VotePage = "https://www.builtbybel.com/blog/19-apps/41-check-with-the-readysunvalley-app-if-your-device-works-with-windows11-sun-valley-update";

diff --git a/src/RSV/Helpers/Utils.cs b/src/RSV/Helpers/Utils.cs
@@ -10,7 +10,6 @@ public static class Utils
     {
         public static Version CurrentVersion = new Version(Application.ProductVersion);
         public static Version LatestVersion;
-        public static Version uriUtilLatestVersion;
 
         public static void AppUpdate()
         {

diff --git a/src/RSV/Locales/Locale.Designer.cs b/src/RSV/Locales/Locale.Designer.cs
diff --git a/src/RSV/Locales/Locale.de.resx b/src/RSV/Locales/Locale.de.resx
@@ -225,10 +225,6 @@
     <value>Bereit%20für%20%23Windows11/Sun%20Valley%20update?%20Hier%20ist%20mein%20Kompatibilitätsbericht%20%23ReadySunValley%20%23app</value>
     <comment>GUI</comment>
   </data>
-  <data name="btnCompareUtil" xml:space="preserve">
-    <value>Zweite Meinung einholen</value>
-    <comment>GUI</comment>
-  </data>
   <data name="btnPnlShareScreen" xml:space="preserve">
     <value>Aufnehmen und auf Twitter teilen</value>
     <comment>GUI</comment>
@@ -258,15 +254,15 @@
     <comment>Description</comment>
   </data>
   <data name="descCPUBad" xml:space="preserve">
-    <value>Deine CPU erfüllt nicht die Spezifikationsanforderungen. Weitere Informationen zu deiner CPU erhältst du im linken Ergebnisfenster</value>
+    <value>Deine CPU erfüllt nicht die Spezifikationsanforderungen.\n\nDu findest eine Liste der unterstüzten Prozessoren hier\n\nIntel:\nhttps://docs.microsoft.com/en-us/windows-hardware/design/minimum/supported/windows-11-supported-intel-processors\n\nAMD:\nhttps://docs.microsoft.com/en-us/windows-hardware/design/minimum/supported/windows-11-supported-amd-processors</value>
     <comment>Description</comment>
   </data>
   <data name="descCPUCoresBad" xml:space="preserve">
     <value>Du hast nicht genug Prozessorkerne, um Windows 11 auszuführen.</value>
     <comment>Description</comment>
   </data>
   <data name="descCPUInfo" xml:space="preserve">
-    <value>Deine CPU erfüllt die Mindestanforderungen, sie ist nur nicht in der offiziellen Liste der unterstützten Prozessoren aufgeführt. Dies ist nur eine Information für dich. Die Anforderung ist aber erstmal erfüllt.\n\nDu findest eine Liste der untersützten Prozessoren hier\n\nIntel:\nhttps://docs.microsoft.com/en-us/windows-hardware/design/minimum/supported/windows-11-supported-intel-processors\n\nAMD:\nhttps://docs.microsoft.com/en-us/windows-hardware/design/minimum/supported/windows-11-supported-amd-processors</value>
+    <value>Deine CPU erfüllt die Mindestanforderungen, sie ist nur nicht in der offiziellen Liste der unterstützten Prozessoren aufgeführt. Dies ist nur eine Information für dich. Die Anforderung ist aber erstmal erfüllt.\n\nDu findest eine Liste der unterstüzten Prozessoren hier\n\nIntel:\nhttps://docs.microsoft.com/en-us/windows-hardware/design/minimum/supported/windows-11-supported-intel-processors\n\nAMD:\nhttps://docs.microsoft.com/en-us/windows-hardware/design/minimum/supported/windows-11-supported-amd-processors</value>
     <comment>Description</comment>
   </data>
   <data name="descCPUSpeedBad" xml:space="preserve">
@@ -286,7 +282,7 @@
     <comment>Description</comment>
   </data>
   <data name="descInetBad" xml:space="preserve">
-    <value>Windows 11 Home Edition erfordert eine Internetverbindung und ein Microsoft-Konto, um die Einrichtung des Geräts bei der ersten Verwendung abzuschließen. Das Umschalten eines Geräts aus Windows 11 Home in den S-Modus erfordert ebenfalls eine Internetverbindung.</value>
+    <value>Wir sind nicht in der Lage, uns mit dem Internet zu verbinden. Windows 11 Home Edition erfordert eine Internetverbindung und ein Microsoft-Konto, um die Einrichtung des Geräts bei der ersten Verwendung abzuschließen. Das Umschalten eines Geräts aus Windows 11 Home in den S-Modus erfordert ebenfalls eine Internetverbindung.</value>
     <comment>Description</comment>
   </data>
   <data name="descPartitionBad" xml:space="preserve">
@@ -339,10 +335,6 @@
     <value>Möchtest du die Ergebnisse mit dem Tool "WhyNotWin11" vergleichen?</value>
     <comment>GUI</comment>
   </data>
-  <data name="infoCompareUtilDownloadMessage" xml:space="preserve">
-    <value>Bereit! Lege nun die beiden Apps nebeneinander und schaue dir die Ergebnisse an.</value>
-    <comment>GUI</comment>
-  </data>
   <data name="infoUpdate" xml:space="preserve">
     <value>App-Aktualisierung verfügbar</value>
     <comment>GUI</comment>
@@ -452,9 +444,13 @@
     <comment>Check</comment>
   </data>
   <data name="lblSubHeader" xml:space="preserve">
-    <value>* für das System</value>
+    <value>*für das System</value>
     <comment>GUI</comment>
   </data>
+  <data name="lblThreads" xml:space="preserve">
+    <value>Threads</value>
+    <comment>Check</comment>
+  </data>
   <data name="lblTPM" xml:space="preserve">
     <value>TPM</value>
     <comment>Check</comment>

diff --git a/src/RSV/Locales/Locale.ja.resx b/src/RSV/Locales/Locale.ja.resx
@@ -228,10 +228,6 @@ Windows 11に非対応です</value>
     <value>Windows11/Sun%20Valleyの更新はOK? これは「ReadySunValley」アプリの結果です</value>
     <comment>GUI</comment>
   </data>
-  <data name="btnCompareUtil" xml:space="preserve">
-    <value>セカンドオピニオンを得る</value>
-    <comment>GUI</comment>
-  </data>
   <data name="btnPnlShareScreen" xml:space="preserve">
     <value>キャプチャしてTwitterで共有</value>
     <comment>GUI</comment>

diff --git a/src/RSV/Locales/Locale.resx b/src/RSV/Locales/Locale.resx
@@ -225,10 +225,6 @@
     <value>Ready%20for%20%23Windows11/Sun%20Valley%20update?%20Here%20are%20my%20results%20%23ReadySunValley%20%23app</value>
     <comment>GUI</comment>
   </data>
-  <data name="btnCompareUtil" xml:space="preserve">
-    <value>Get a second opinion</value>
-    <comment>GUI</comment>
-  </data>
   <data name="btnPnlShareScreen" xml:space="preserve">
     <value>Capture and Share on Twitter</value>
     <comment>GUI</comment>
@@ -258,7 +254,7 @@
     <comment>Description</comment>
   </data>
   <data name="descCPUBad" xml:space="preserve">
-    <value>Your CPU doesn't meet the specification requirements, see individual info about frequency or cores below.</value>
+    <value>Your CPU doesn't meet the specification requirements.\n\nYou can find a list of supported processors here\n\nIntel:\nhttps://docs.microsoft.com/en-us/windows-hardware/design/minimum/supported/windows-11-supported-intel-processors\n\nAMD:\nhttps://docs.microsoft.com/en-us/windows-hardware/design/minimum/supported/windows-11-supported-amd-processors</value>
     <comment>Description</comment>
   </data>
   <data name="descCPUCoresBad" xml:space="preserve">
@@ -286,7 +282,7 @@
     <comment>Description</comment>
   </data>
   <data name="descInetBad" xml:space="preserve">
-    <value>Windows 11 Home edition requires internet connectivity and a Microsoft account to complete device setup on first use. Switching a device out of Windows 11 Home in S mode also requires internet connectivity.</value>
+    <value>We weren't able to connect to the internet. Windows 11 Home edition requires internet connectivity and a Microsoft account to complete device setup on first use. Switching a device out of Windows 11 Home in S mode also requires internet connectivity.</value>
     <comment>Description</comment>
   </data>
   <data name="descPartitionBad" xml:space="preserve">
@@ -339,10 +335,6 @@
     <value>Do you want to compare the results with the Utility "WhyNotWin11"?</value>
     <comment>GUI</comment>
   </data>
-  <data name="infoCompareUtilDownloadMessage" xml:space="preserve">
-    <value>Ready! So now put the two apps next to each other and take a look at the results.</value>
-    <comment>GUI</comment>
-  </data>
   <data name="infoUpdate" xml:space="preserve">
     <value>App update available</value>
     <comment>GUI</comment>
@@ -452,9 +444,13 @@
     <comment>Check</comment>
   </data>
   <data name="lblSubHeader" xml:space="preserve">
-    <value>* for System</value>
+    <value>*for System</value>
     <comment>GUI</comment>
   </data>
+  <data name="lblThreads" xml:space="preserve">
+    <value>Threads</value>
+    <comment>Check</comment>
+  </data>
   <data name="lblTPM" xml:space="preserve">
     <value>TPM</value>
     <comment>Check</comment>