Release 2.3

aelij · Apr 2, 2016 · 04b77c7 · 04b77c7
1 parent 021c7a3
commit 04b77c7
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 10 deletions.
diff --git a/src/WpfContrib/Properties/AssemblyInfo.cs b/src/WpfContrib/Properties/AssemblyInfo.cs
@@ -14,8 +14,8 @@
 [assembly: AssemblyCompany("Eli Arbel")]
 [assembly: AssemblyProduct("WPF Contrib")]
 [assembly: AssemblyCopyright("Copyright 2015")]
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.3.0.0")]
+[assembly: AssemblyFileVersion("2.3.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, // theme-specific

diff --git a/src/WpfContribTest/WpfContribTest.csproj b/src/WpfContribTest/WpfContribTest.csproj
@@ -54,7 +54,7 @@
     <UseVSHostingProcess>true</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>AC5C9D2D5395744EC9FA5861F38FA859A84F704A</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>DB794FBDC173BCFE70C76F4D07CEA44D3FAD1B84</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestKeyFile>WpfContribTest_TemporaryKey.pfx</ManifestKeyFile>
@@ -63,7 +63,7 @@
     <GenerateManifests>false</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>false</SignManifests>
+    <SignManifests>true</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
     <TargetZone>Internet</TargetZone>
@@ -126,9 +126,9 @@
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <None Include="WpfContribTest_TemporaryKey.pfx" />
     <None Include="Properties\app.manifest" />
     <AppDesigner Include="Properties\" />
+    <None Include="WpfContribTest_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\WpfContribTestPages\WpfContribTestPages.csproj">

diff --git a/src/WpfContribTest/WpfContribTest_TemporaryKey.pfx b/src/WpfContribTest/WpfContribTest_TemporaryKey.pfx
diff --git a/src/WpfContribTestBrowser/WpfContribTestBrowser.csproj b/src/WpfContribTestBrowser/WpfContribTestBrowser.csproj
@@ -18,9 +18,9 @@
     <HostInBrowser>true</HostInBrowser>
     <TargetZone>Internet</TargetZone>
     <GenerateManifests>true</GenerateManifests>
-    <SignManifests>false</SignManifests>
+    <SignManifests>true</SignManifests>
     <ManifestKeyFile>WpfContribTestBrowser_TemporaryKey.pfx</ManifestKeyFile>
-    <ManifestCertificateThumbprint>8213BD846C23739AE0225E57C717C26C5FFED5D3</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>A8AA3D89528F67DF9CDBAF2F222B7DB595A5E002</ManifestCertificateThumbprint>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -106,9 +106,9 @@
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <None Include="WpfContribTestBrowser_TemporaryKey.pfx" />
     <None Include="Properties\app.manifest" />
     <AppDesigner Include="Properties\" />
+    <None Include="WpfContribTestBrowser_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\WpfContribTestPages\WpfContribTestPages.csproj">

diff --git a/src/WpfContribTestBrowser/WpfContribTestBrowser_TemporaryKey.pfx b/src/WpfContribTestBrowser/WpfContribTestBrowser_TemporaryKey.pfx
diff --git a/src/WpfContribTestPages/Pages/Introduction.xaml b/src/WpfContribTestPages/Pages/Introduction.xaml
@@ -18,7 +18,7 @@
         <Grid>
             <TextBlock Margin="10">
                 <Bold FontSize="16">Welcome to the WPF Contrib Library</Bold>
-                <Run>(March 2014)</Run>
+                <Run x:Name="Version"></Run>
                 <LineBreak />
                 Please select a demo from the left.
             </TextBlock>

diff --git a/src/WpfContribTestPages/Pages/Introduction.xaml.cs b/src/WpfContribTestPages/Pages/Introduction.xaml.cs
@@ -8,6 +8,7 @@ public partial class Introduction
         public Introduction()
         {
             InitializeComponent();
+            Version.Text = typeof(Avalon.Windows.Controls.TaskDialog).Assembly.GetName().Version.ToString();
         }
     }
 }
diff --git a/src/WpfContribTestPages/Properties/AssemblyInfo.cs b/src/WpfContribTestPages/Properties/AssemblyInfo.cs
@@ -1,5 +1,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Security;
 using System.Windows;
 
 // General Information about an assembly is controlled through the following 
@@ -53,4 +54,6 @@
 // [assembly: AssemblyVersion("1.0.*")]
 
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: AllowPartiallyTrustedCallers]