Merge pull request #2 from Cootz/dev

Dev merge

.upgrade-assistant

@@ -0,0 +1 @@
+{"Build":"0.4.355802\u002Bb2aeae2c0e41fbfed35df6ab2e88b82a0c11be2b","CurrentProject":"Passwords.csproj","EntryPoints":["Passwords.csproj"],"Properties":{}}

AnalysisReport.sarif

@@ -0,0 +1,82 @@
+{
+  "$schema": "https://schemastore.azurewebsites.net/schemas/json/sarif-2.1.0-rtm.5.json",
+  "version": "2.1.0",
+  "runs": [
+    {
+      "tool": {
+        "driver": {
+          "name": "Dependency Analysis",
+          "semanticVersion": "0.4.355802",
+          "informationUri": "https://docs.microsoft.com/en-us/dotnet/core/porting/upgrade-assistant-overview",
+          "rules": [
+            {
+              "id": "UA106",
+              "name": "PackageToBeAdded",
+              "fullDescription": {
+                "text": "Packages that need to be added in order to upgrade the project to chosen TFM"
+              },
+              "helpUri": "https://docs.microsoft.com/en-us/dotnet/core/porting/upgrade-assistant-overview"
+            }
+          ]
+        }
+      },
+      "results": [
+        {
+          "ruleId": "UA106",
+          "message": {
+            "text": "Package Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers, Version=0.4.355802 needs to be added."
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "file:///C:/Users/PC/Source/Repos/PasswordManager/Passwords/Passwords.csproj"
+                },
+                "region": {}
+              }
+            }
+          ]
+        },
+        {
+          "ruleId": "UA106",
+          "message": {
+            "text": "Package Microsoft.Windows.Compatibility, Version=7.0.0 needs to be added."
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "file:///C:/Users/PC/Source/Repos/PasswordManager/Passwords/Passwords.csproj"
+                },
+                "region": {}
+              }
+            }
+          ]
+        }
+      ],
+      "columnKind": "utf16CodeUnits"
+    },
+    {
+      "tool": {
+        "driver": {
+          "name": "API Upgradability",
+          "semanticVersion": "0.4.355802",
+          "informationUri": "https://docs.microsoft.com/en-us/dotnet/core/porting/upgrade-assistant-overview"
+        }
+      },
+      "results": [],
+      "columnKind": "utf16CodeUnits"
+    },
+    {
+      "tool": {
+        "driver": {
+          "name": "Component Analysis",
+          "semanticVersion": "0.4.355802",
+          "informationUri": "https://docs.microsoft.com/en-us/dotnet/core/porting/upgrade-assistant-overview"
+        }
+      },
+      "results": [],
+      "columnKind": "utf16CodeUnits"
+    }
+  ]
+}

Passwords/PasData/DBController.cs

@@ -50,7 +50,7 @@ public async Task Initialize()
                 try
                 {
                     await CreateCommand("CREATE TABLE Profiles " +
-                           "(ProfileID int NOT NULL UNIQIE," +
+                           "(ProfileID int PRIMARY KEY," +
                            "Service nvarchar(4000) NOT NULL," +
                            "Email nvarchar(4000) NOT NULL," +
                            "Password nvarchar(4000) NOT NULL," +

Passwords/Passwords.csproj

@@ -1,29 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="EntityFramework.SqlServerCompact" Version="6.4.4" />
-    <PackageReference Include="FluentMigrator.Runner.SqlServerCe" Version="3.2.17" />
+    <PackageReference Include="FluentMigrator.Runner.SqlServerCe" Version="3.3.2" />
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.355802">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0" />
   </ItemGroup>
-
   <ItemGroup>
     <Compile Update="PDS.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>PDS.xsd</DependentUpon>
     </Compile>
   </ItemGroup>
-
   <ItemGroup>
     <None Update="PDS.xsd">
       <Generator>MSDataSetGenerator</Generator>
       <LastGenOutput>PDS.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
-
 </Project>

Passwords/Passwords.csproj.user

@@ -7,15 +7,15 @@
     </ApplicationDefinition>
   </ItemGroup>
   <ItemGroup>
-    <Compile Update="Recent.xaml.cs">
+    <Compile Update="Views\Recent.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
   <ItemGroup>
     <Page Update="MainWindow.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Update="Recent.xaml">
+    <Page Update="Views\Recent.xaml">
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>

Passwords/Recent.xaml → Passwords/Views/Recent.xaml

@@ -36,12 +36,16 @@
             <TextBlock DockPanel.Dock="Top" Text="Recent" FontSize="20" FontFamily="Areal"/>
 
             <Grid DockPanel.Dock="Right">
-                <ListBox BorderThickness="0"/>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="37*"/>
+                </Grid.ColumnDefinitions>
+                <ListBox BorderThickness="0" Grid.ColumnSpan="2"/>
             </Grid>
         </DockPanel>
 
 
     </DockPanel>
 
-    
+
 </Page>

Passwords/Recent.xaml.cs → Passwords/Views/Recent.xaml.cs

@@ -26,7 +26,7 @@ public Recent()
             //    }
             //});
 
-            List<Profile> profiles = PasswordController.SearhProfiles("Service=\'steam\'").Result;
+            List<Profile> profiles = PasswordController.SearhProfiles("Service LIKE 'steam'").Result;
 
             foreach (var prof in profiles)
             {