testing oneclick stuff

2016-03-13 13:40:24 +01:00 · 2016-03-13 13:40:24 +01:00 · 05c5656ce9
commit 05c5656ce9
parent df4115c0fd
6 changed files with 181 additions and 71 deletions
--- a/.vs/Gästeliste/v14/.suo
+++ b/.vs/Gästeliste/v14/.suo
--- a/Gästeliste/Gästeliste.vbproj
+++ b/Gästeliste/Gästeliste.vbproj
@ -31,11 +31,10 @@
    <ProductName>Gästeliste</ProductName>
    <PublisherName>Dominic Reich</PublisherName>
    <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationRevision>3</ApplicationRevision>
    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
+    <UseApplicationTrust>true</UseApplicationTrust>
    <CreateDesktopShortcut>true</CreateDesktopShortcut>
-    <ExcludeDeploymentUrl>true</ExcludeDeploymentUrl>
    <PublishWizardCompleted>true</PublishWizardCompleted>
    <BootstrapperEnabled>true</BootstrapperEnabled>
  </PropertyGroup>
@ -74,7 +73,7 @@
    <OptionInfer>On</OptionInfer>
  </PropertyGroup>
  <PropertyGroup>
-    <ApplicationIcon>bed.ico</ApplicationIcon>
+    <ApplicationIcon>AddressBook.ico</ApplicationIcon>
  </PropertyGroup>
  <PropertyGroup>
    <ManifestCertificateThumbprint>7333803A93B717E3FFCB65C8CB363B334722D217</ManifestCertificateThumbprint>
@ -86,7 +85,13 @@
    <GenerateManifests>true</GenerateManifests>
  </PropertyGroup>
  <PropertyGroup>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetZone>Internet</TargetZone>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
@ -179,6 +184,7 @@
      <DependentUpon>GästeDataSet.xsd</DependentUpon>
    </None>
    <None Include="Gästeliste_TemporaryKey.pfx" />
+    <None Include="My Project\app.manifest" />
    <None Include="My Project\Application.myapp">
      <Generator>MyApplicationCodeGenerator</Generator>
      <LastGenOutput>Application.Designer.vb</LastGenOutput>
--- a/Gästeliste/Gästeliste.vbproj.user
+++ b/Gästeliste/Gästeliste.vbproj.user
@ -3,10 +3,10 @@
  <PropertyGroup>
    <PublishUrlHistory>Z:\Gaesteliste\|publish\</PublishUrlHistory>
    <InstallUrlHistory>http://tools.dominicreich.com/Gaesteliste/</InstallUrlHistory>
-    <SupportUrlHistory />
-    <UpdateUrlHistory />
+    <SupportUrlHistory>http://tmsn.at/%3ftools&amp;gaesteliste</SupportUrlHistory>
+    <UpdateUrlHistory>http://tools.dominicreich.com/Gaesteliste/</UpdateUrlHistory>
    <BootstrapperUrlHistory />
-    <ErrorReportUrlHistory />
+    <ErrorReportUrlHistory>https://github.com/freefallcid/Gaesteliste/issues</ErrorReportUrlHistory>
    <FallbackCulture>de-DE</FallbackCulture>
    <VerifyUploadedFiles>false</VerifyUploadedFiles>
  </PropertyGroup>
--- a/Project/app.manifest
+++ b/Project/app.manifest
@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC-Manifestoptionen
+             Wenn Sie die Ebene der Benutzerkontensteuerung für Windows ändern möchten, ersetzen Sie den 
+             Knoten "requestedExecutionLevel" wie folgt.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Durch Angabe des Elements "requestedExecutionLevel" wird die Datei- und Registrierungsvirtualisierung deaktiviert. 
+            Entfernen Sie dieses Element, wenn diese Virtualisierung aus Gründen der Abwärtskompatibilität
+            für die Anwendung erforderlich ist.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+      <applicationRequestMinimum>
+        <defaultAssemblyRequest permissionSetReference="Custom" />
+        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
+      </applicationRequestMinimum>
+    </security>
+  </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Eine Liste der Windows-Versionen, unter denen diese Anwendung getestet
+           und für die sie entwickelt wurde. Wenn Sie die Auskommentierung der entsprechenden Elemente aufheben, 
+           wird von Windows automatisch die kompatibelste Umgebung ausgewählt. -->
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+    </application>
+  </compatibility>
+  <!-- Gibt an, dass die Anwendung mit DPI-Werten kompatibel ist und von Windows nicht automatisch auf höhere
+       DPI-Werte skaliert wird. WPF-Anwendungen (Windows Presentation Foundation) sind automatisch mit DPI-Werten kompatibel und müssen sich nicht  
+       anmelden. Für Windows Forms-Anwendungen für .NET Framework 4.6, die sich für diese Einstellung anmelden, muss 
+       auch die Einstellung "'EnableWindowsFormsHighDpiAutoResizing" in der "app.config" auf "true" festgelegt werden. -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+  -->
+  <!-- Designs für allgemeine Windows-Steuerelemente und -Dialogfelder (Windows XP und höher) aktivieren -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+</assembly>
--- a/Gästeliste/frmMain.Designer.vb
+++ b/Gästeliste/frmMain.Designer.vb
@ -25,14 +25,6 @@ Partial Class frmMain
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
        Me.DataGridView1 = New System.Windows.Forms.DataGridView()
-        Me.mnuMain = New System.Windows.Forms.MenuStrip()
-        Me.HilfeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.InfoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripSeparator()
-        Me.HilfePerEmailAnfordernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.FehlerMeldenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.mnuContext = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.EintragLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.IDDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.NachnameDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.VornameDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
@ -47,12 +39,22 @@ Partial Class frmMain
        Me.AnmerkungDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.GästeBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.GästeDataSet = New Gästeliste.GästeDataSet()
+        Me.mnuMain = New System.Windows.Forms.MenuStrip()
+        Me.HilfeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.InfoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.OnlineHilfeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripSeparator()
+        Me.HilfePerEmailAnfordernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.FehlerMeldenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.mnuContext = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.EintragLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.UpdateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripSeparator()
        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.mnuMain.SuspendLayout()
-        Me.mnuContext.SuspendLayout()
        CType(Me.GästeBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GästeDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.mnuMain.SuspendLayout()
+        Me.mnuContext.SuspendLayout()
        Me.SuspendLayout()
        '
        'DataGridView1
@ -70,57 +72,6 @@ Partial Class frmMain
        Me.DataGridView1.Size = New System.Drawing.Size(818, 483)
        Me.DataGridView1.TabIndex = 4
        '
-        'mnuMain
-        '
-        Me.mnuMain.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.HilfeToolStripMenuItem})
-        Me.mnuMain.Location = New System.Drawing.Point(0, 0)
-        Me.mnuMain.Name = "mnuMain"
-        Me.mnuMain.Size = New System.Drawing.Size(818, 24)
-        Me.mnuMain.TabIndex = 5
-        Me.mnuMain.Text = "MenuStrip1"
-        '
-        'HilfeToolStripMenuItem
-        '
-        Me.HilfeToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.InfoToolStripMenuItem, Me.OnlineHilfeToolStripMenuItem, Me.ToolStripMenuItem1, Me.HilfePerEmailAnfordernToolStripMenuItem, Me.FehlerMeldenToolStripMenuItem})
-        Me.HilfeToolStripMenuItem.Name = "HilfeToolStripMenuItem"
-        Me.HilfeToolStripMenuItem.Size = New System.Drawing.Size(44, 20)
-        Me.HilfeToolStripMenuItem.Text = "Hilfe"
-        '
-        'InfoToolStripMenuItem
-        '
-        Me.InfoToolStripMenuItem.Name = "InfoToolStripMenuItem"
-        Me.InfoToolStripMenuItem.Size = New System.Drawing.Size(206, 22)
-        Me.InfoToolStripMenuItem.Text = "Info"
-        '
-        'ToolStripMenuItem1
-        '
-        Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
-        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(203, 6)
-        '
-        'HilfePerEmailAnfordernToolStripMenuItem
-        '
-        Me.HilfePerEmailAnfordernToolStripMenuItem.Name = "HilfePerEmailAnfordernToolStripMenuItem"
-        Me.HilfePerEmailAnfordernToolStripMenuItem.Size = New System.Drawing.Size(206, 22)
-        Me.HilfePerEmailAnfordernToolStripMenuItem.Text = "Hilfe per Email anfordern"
-        '
-        'FehlerMeldenToolStripMenuItem
-        '
-        Me.FehlerMeldenToolStripMenuItem.Name = "FehlerMeldenToolStripMenuItem"
-        Me.FehlerMeldenToolStripMenuItem.Size = New System.Drawing.Size(206, 22)
-        Me.FehlerMeldenToolStripMenuItem.Text = "Fehler melden"
-        '
-        'mnuContext
-        '
-        Me.mnuContext.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EintragLöschenToolStripMenuItem})
-        Me.mnuContext.Name = "mnuContext"
-        Me.mnuContext.Size = New System.Drawing.Size(156, 26)
-        '
-        'EintragLöschenToolStripMenuItem
-        '
-        Me.EintragLöschenToolStripMenuItem.Name = "EintragLöschenToolStripMenuItem"
-        Me.EintragLöschenToolStripMenuItem.Size = New System.Drawing.Size(155, 22)
-        Me.EintragLöschenToolStripMenuItem.Text = "Eintrag löschen"
-        '
        'IDDataGridViewTextBoxColumn
        '
        Me.IDDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells
@ -226,12 +177,74 @@ Partial Class frmMain
        Me.GästeDataSet.DataSetName = "GästeDataSet"
        Me.GästeDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
        '
+        'mnuMain
+        '
+        Me.mnuMain.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.HilfeToolStripMenuItem})
+        Me.mnuMain.Location = New System.Drawing.Point(0, 0)
+        Me.mnuMain.Name = "mnuMain"
+        Me.mnuMain.Size = New System.Drawing.Size(818, 24)
+        Me.mnuMain.TabIndex = 5
+        Me.mnuMain.Text = "MenuStrip1"
+        '
+        'HilfeToolStripMenuItem
+        '
+        Me.HilfeToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.InfoToolStripMenuItem, Me.OnlineHilfeToolStripMenuItem, Me.ToolStripMenuItem1, Me.UpdateToolStripMenuItem, Me.ToolStripMenuItem2, Me.HilfePerEmailAnfordernToolStripMenuItem, Me.FehlerMeldenToolStripMenuItem})
+        Me.HilfeToolStripMenuItem.Name = "HilfeToolStripMenuItem"
+        Me.HilfeToolStripMenuItem.Size = New System.Drawing.Size(44, 20)
+        Me.HilfeToolStripMenuItem.Text = "Hilfe"
+        '
+        'InfoToolStripMenuItem
+        '
+        Me.InfoToolStripMenuItem.Name = "InfoToolStripMenuItem"
+        Me.InfoToolStripMenuItem.Size = New System.Drawing.Size(206, 22)
+        Me.InfoToolStripMenuItem.Text = "Info"
+        '
        'OnlineHilfeToolStripMenuItem
        '
        Me.OnlineHilfeToolStripMenuItem.Name = "OnlineHilfeToolStripMenuItem"
        Me.OnlineHilfeToolStripMenuItem.Size = New System.Drawing.Size(206, 22)
        Me.OnlineHilfeToolStripMenuItem.Text = "Online-Hilfe"
        '
+        'ToolStripMenuItem1
+        '
+        Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
+        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(203, 6)
+        '
+        'HilfePerEmailAnfordernToolStripMenuItem
+        '
+        Me.HilfePerEmailAnfordernToolStripMenuItem.Name = "HilfePerEmailAnfordernToolStripMenuItem"
+        Me.HilfePerEmailAnfordernToolStripMenuItem.Size = New System.Drawing.Size(206, 22)
+        Me.HilfePerEmailAnfordernToolStripMenuItem.Text = "Hilfe per Email anfordern"
+        '
+        'FehlerMeldenToolStripMenuItem
+        '
+        Me.FehlerMeldenToolStripMenuItem.Name = "FehlerMeldenToolStripMenuItem"
+        Me.FehlerMeldenToolStripMenuItem.Size = New System.Drawing.Size(206, 22)
+        Me.FehlerMeldenToolStripMenuItem.Text = "Fehler melden"
+        '
+        'mnuContext
+        '
+        Me.mnuContext.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EintragLöschenToolStripMenuItem})
+        Me.mnuContext.Name = "mnuContext"
+        Me.mnuContext.Size = New System.Drawing.Size(156, 26)
+        '
+        'EintragLöschenToolStripMenuItem
+        '
+        Me.EintragLöschenToolStripMenuItem.Name = "EintragLöschenToolStripMenuItem"
+        Me.EintragLöschenToolStripMenuItem.Size = New System.Drawing.Size(155, 22)
+        Me.EintragLöschenToolStripMenuItem.Text = "Eintrag löschen"
+        '
+        'UpdateToolStripMenuItem
+        '
+        Me.UpdateToolStripMenuItem.Name = "UpdateToolStripMenuItem"
+        Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(206, 22)
+        Me.UpdateToolStripMenuItem.Text = "Update"
+        '
+        'ToolStripMenuItem2
+        '
+        Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2"
+        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(203, 6)
+        '
        'frmMain
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@ -244,11 +257,11 @@ Partial Class frmMain
        Me.Name = "frmMain"
        Me.Text = "Gästeliste"
        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GästeBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GästeDataSet, System.ComponentModel.ISupportInitialize).EndInit()
        Me.mnuMain.ResumeLayout(False)
        Me.mnuMain.PerformLayout()
        Me.mnuContext.ResumeLayout(False)
-        CType(Me.GästeBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.GästeDataSet, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@ -278,4 +291,6 @@ Partial Class frmMain
    Friend WithEvents mnuContext As ContextMenuStrip
    Friend WithEvents EintragLöschenToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents OnlineHilfeToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents UpdateToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem2 As ToolStripSeparator
 End Class
--- a/Gästeliste/frmMain.vb
+++ b/Gästeliste/frmMain.vb
@ -1,4 +1,6 @@
 Imports System.ComponentModel
+Imports System.Deployment
+Imports System.Deployment.Application

 Public Class frmMain
    Private _dataPath As String = System.IO.Path.Combine(My.Computer.FileSystem.SpecialDirectories.MyDocuments, "Gästeliste.xml")
@ -58,4 +60,21 @@ Public Class frmMain
    Private Sub OnlineHilfeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OnlineHilfeToolStripMenuItem.Click
        Process.Start("http://tmsn.at/?tools&gaesteliste&hilfe")
    End Sub
+
+    Private Sub UpdateToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles UpdateToolStripMenuItem.Click
+        Dim Info As UpdateCheckInfo
+
+        If ApplicationDeployment.IsNetworkDeployed Then
+            Dim AD As ApplicationDeployment = ApplicationDeployment.CurrentDeployment
+
+            Info = AD.CheckForDetailedUpdate
+            If Info.UpdateAvailable Then
+                If MsgBox("Ein Update ist verfügbar, willst du jetzt aktualisieren?", vbYesNo) = vbYes Then
+                    AD.UpdateAsync()
+                End If
+            Else
+                MsgBox("Es ist kein Update verfügbar.")
+            End If
+        End If
+    End Sub
 End Class