Skip to content

Commit

Permalink
Merge branch 'release-7.0.0-beta.3'
Browse files Browse the repository at this point in the history 
- FIX: Attempt to prevent crashes when a file dialog should appear.
- FIX: Minor fixes.
  • Loading branch information
@bovender
bovender committed Apr 29, 2016
2 parents 6d00bf2 + f53ddf2 commit f06ca4c
Show file tree
Hide file tree
Showing 18 changed files with 88 additions and 896 deletions.
4 changes: 2 additions & 2 deletions Tests/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.0.0.21")]
[assembly: AssemblyFileVersion("7.0.0.21")]
[assembly: AssemblyVersion("7.0.0.22")]
[assembly: AssemblyFileVersion("7.0.0.22")]
8 changes: 4 additions & 4 deletions Tests/Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Debug %28Bovender via NuGet%29'">
<Reference Include="Bovender, Version=0.5.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<Reference Include="Bovender, Version=0.5.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Bovender.0.5.0.0\lib\net40\Bovender.dll</HintPath>
<HintPath>..\packages\Bovender.0.5.1.0\lib\net40\Bovender.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Release'">
<Reference Include="Bovender, Version=0.5.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<Reference Include="Bovender, Version=0.5.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Bovender.0.5.0.0\lib\net40\Bovender.dll</HintPath>
<HintPath>..\packages\Bovender.0.5.1.0\lib\net40\Bovender.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Tests/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
limitations under the License.
-->
<packages>
<package id="Bovender" version="0.5.0.0" targetFramework="net40" />
<package id="Bovender" version="0.5.1.0" targetFramework="net40" />
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
<package id="NUnitTestAdapter" version="2.0.0" targetFramework="net40" />
</packages>
4 changes: 2 additions & 2 deletions VERSION
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
7.0.0-beta.2
7.0.0.21
7.0.0-beta.3
7.0.0.22
114 changes: 58 additions & 56 deletions XLToolbox/ExceptionHandler/ExceptionDetailView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,75 +33,77 @@
<ResourceDictionary Source="/Bovender;component/style.xaml" />
</Window.Resources>
<DockPanel Margin="10">
<StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,0,0">
<Button Content="{x:Static l:Strings.Close}" IsCancel="True">
<!-- Use interaction trigger rather than MVVM CloseViewCommand since the latter
would cause all subscribed views to be closed, including the ExceptionView instance. -->
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
<ei:CallMethodAction TargetObject="{Binding ElementName=exceptionDetailView}" MethodName="Close" />
</i:EventTrigger>
</i:Interaction.Triggers>
</Button>
</StackPanel>
<Grid DockPanel.Dock="Bottom" Margin="0,10,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition />
</Grid.RowDefinitions>
<Grid Margin="0,0,5,0" Grid.Column="0" Grid.Row="0">
<StackPanel DockPanel.Dock="Bottom">
<Grid Margin="0,10,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="{x:Static l:Strings.XLToolboxVersion}" />
<TextBox Grid.Column="1" Grid.Row="0" Text="{Binding Path=ToolboxVersion, Mode=OneWay}" />
<Label Grid.Column="0" Grid.Row="1" Content="{x:Static l:Strings.ExcelVersion}" />
<TextBox Grid.Column="1" Grid.Row="1" Text="{Binding Path=ExcelVersion, Mode=OneWay}" />
<Label Grid.Column="0" Grid.Row="2" Content="{x:Static l:Strings.ExcelBitness}" />
<TextBox Grid.Column="1" Grid.Row="2" Text="{Binding Path=ExcelBitness, Mode=OneWay}" />
<Label Grid.Column="0" Grid.Row="3" Content="{x:Static l:Strings.FreeImageVersion}" />
<TextBox Grid.Column="1" Grid.Row="3" Text="{Binding Path=FreeImageVersion, Mode=OneWay}"
<Grid Margin="0,0,5,0" Grid.Column="0" Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="{x:Static l:Strings.XLToolboxVersion}" />
<TextBox Grid.Column="1" Grid.Row="0" Text="{Binding Path=ToolboxVersion, Mode=OneWay}" />
<Label Grid.Column="0" Grid.Row="1" Content="{x:Static l:Strings.ExcelVersion}" />
<TextBox Grid.Column="1" Grid.Row="1" Text="{Binding Path=ExcelVersion, Mode=OneWay}" />
<Label Grid.Column="0" Grid.Row="2" Content="{x:Static l:Strings.ExcelBitness}" />
<TextBox Grid.Column="1" Grid.Row="2" Text="{Binding Path=ExcelBitness, Mode=OneWay}" />
<Label Grid.Column="0" Grid.Row="3" Content="{x:Static l:Strings.FreeImageVersion}" />
<TextBox Grid.Column="1" Grid.Row="3" Text="{Binding Path=FreeImageVersion, Mode=OneWay}"
MaxWidth="250" />
</Grid>
<Grid Margin="5,0,0,0" Grid.Column="1" Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="{x:Static l:Strings.OSVersion}" />
<TextBox Grid.Column="1" Grid.Row="0" Text="{Binding Path=OS, Mode=OneWay}" />
<Label Grid.Column="0" Grid.Row="1" Content="{x:Static l:Strings.OSBitness}" />
<TextBox Grid.Column="1" Grid.Row="1" Text="{Binding Path=OSBitness, Mode=OneWay}" />
<Label Grid.Column="0" Grid.Row="2" Content="{x:Static l:Strings.ClrVersion}" />
<TextBox Grid.Column="1" Grid.Row="2" Text="{Binding Path=CLR, Mode=OneWay}" />
<Label Grid.Column="0" Grid.Row="3" Content="{x:Static l:Strings.BovenderFramework}" />
<TextBox Grid.Column="1" Grid.Row="3" Text="{Binding Path=BovenderFramework, Mode=OneWay}" />
</Grid>
</Grid>
<Grid Margin="5,0,0,0" Grid.Column="1" Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="{x:Static l:Strings.OSVersion}" />
<TextBox Grid.Column="1" Grid.Row="0" Text="{Binding Path=OS, Mode=OneWay}" />
<Label Grid.Column="0" Grid.Row="1" Content="{x:Static l:Strings.OSBitness}" />
<TextBox Grid.Column="1" Grid.Row="1" Text="{Binding Path=OSBitness, Mode=OneWay}" />
<Label Grid.Column="0" Grid.Row="2" Content="{x:Static l:Strings.ClrVersion}" />
<TextBox Grid.Column="1" Grid.Row="2" Text="{Binding Path=CLR, Mode=OneWay}" />
<Label Grid.Column="0" Grid.Row="3" Content="{x:Static l:Strings.BovenderFramework}" />
<TextBox Grid.Column="1" Grid.Row="3" Text="{Binding Path=BovenderFramework, Mode=OneWay}" />
</Grid>
</Grid>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,0,0">
<Button Content="{x:Static l:Strings.Close}" IsCancel="True">
<!-- Use interaction trigger rather than MVVM CloseViewCommand since the latter
would cause all subscribed views to be closed, including the ExceptionView instance. -->
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
<ei:CallMethodAction TargetObject="{Binding ElementName=exceptionDetailView}" MethodName="Close" />
</i:EventTrigger>
</i:Interaction.Triggers>
</Button>
</StackPanel>
</StackPanel>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition MinHeight="72" />
<RowDefinition MinHeight="32" />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
Expand Down
4 changes: 2 additions & 2 deletions XLToolbox/Mvvm/Views/StringMessageContentView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 10 0 0">
<UniformGrid>
<Button Command="{Binding Path=Content.ConfirmCommand}"
Content="{x:Static l:Strings.OK}"
Content="{x:Static l:Strings.OK}" IsDefault="True"
Margin="5 0 5 0" />
<Button Command="{Binding Path=Content.CloseViewCommand}"
Content="{x:Static l:Strings.Cancel}"
Content="{x:Static l:Strings.Cancel}" IsCancel="True"
Margin="5 0 5 0" />
</UniformGrid>
</StackPanel>
Expand Down
4 changes: 2 additions & 2 deletions XLToolbox/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.0.0.21")]
[assembly: AssemblyFileVersion("7.0.0.21")]
[assembly: AssemblyVersion("7.0.0.22")]
[assembly: AssemblyFileVersion("7.0.0.22")]
2 changes: 1 addition & 1 deletion XLToolbox/Properties/Settings.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion XLToolbox/Properties/Settings.settings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<Value Profile="(Default)">http://www.xltoolbox.net/donate</Value>
</Setting>
<Setting Name="WhatsNewUrl" Type="System.String" Scope="Application">
<Value Profile="(Default)">http://www.xltoolbox.net/blog/tags/alpha</Value>
<Value Profile="(Default)">http://www.xltoolbox.net/changelog-ng.html</Value>
</Setting>
<Setting Name="WindowManagerAlwaysOnTop" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
Expand Down
2 changes: 1 addition & 1 deletion XLToolbox/SheetManager/WorkbookView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<Button Command="{Binding MoveSheetsToBottom}" Content="{x:Static l:Strings.Bottom}" Margin="0 0 0 5" />
<Button Command="{Binding DeleteSheets}" Content="{x:Static l:Strings.Delete}" Margin="0 5 0 5" />
<Button Command="{Binding RenameSheet}" Content="{x:Static l:Strings.Rename}" Margin="0 5 0 5" />
<Button Command="{Binding CloseViewCommand}" Content="{x:Static l:Strings.Close}" Margin="0 5 0 5" />
<Button Command="{Binding CloseViewCommand}" IsCancel="True" Content="{x:Static l:Strings.Close}" Margin="0 5 0 5" />
</StackPanel>
</DockPanel>
<ListBox
Expand Down
8 changes: 4 additions & 4 deletions XLToolbox/XLToolbox.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Debug %28Bovender via NuGet%29|AnyCPU'">
<Reference Include="Bovender, Version=0.5.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<Reference Include="Bovender, Version=0.5.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Bovender.0.5.0.0\lib\net40\Bovender.dll</HintPath>
<HintPath>..\packages\Bovender.0.5.1.0\lib\net40\Bovender.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Release'">
<Reference Include="Bovender, Version=0.5.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<Reference Include="Bovender, Version=0.5.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Bovender.0.5.0.0\lib\net40\Bovender.dll</HintPath>
<HintPath>..\packages\Bovender.0.5.1.0\lib\net40\Bovender.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion XLToolbox/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<value>http://www.xltoolbox.net/donate</value>
</setting>
<setting name="WhatsNewUrl" serializeAs="String">
<value>http://www.xltoolbox.net/blog/tags/alpha</value>
<value>http://www.xltoolbox.net/changelog-ng.html</value>
</setting>
</XLToolbox.Properties.Settings>
</applicationSettings>
Expand Down
2 changes: 1 addition & 1 deletion XLToolbox/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
limitations under the License.
-->
<packages>
<package id="Bovender" version="0.5.0.0" targetFramework="net40" />
<package id="Bovender" version="0.5.1.0" targetFramework="net40" />
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
<package id="NUnit" version="2.6.4" targetFramework="net40" />
</packages>
4 changes: 2 additions & 2 deletions XLToolboxForExcel/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.0.0.21")]
[assembly: AssemblyFileVersion("7.0.0.21")]
[assembly: AssemblyVersion("7.0.0.22")]
[assembly: AssemblyFileVersion("7.0.0.22")]

[assembly: NeutralResourcesLanguageAttribute("en-US")]
8 changes: 4 additions & 4 deletions XLToolboxForExcel/XLToolboxForExcel.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,15 @@
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Debug %28Bovender via NuGet%29'">
<Reference Include="Bovender, Version=0.5.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<Reference Include="Bovender, Version=0.5.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Bovender.0.5.0.0\lib\net40\Bovender.dll</HintPath>
<HintPath>..\packages\Bovender.0.5.1.0\lib\net40\Bovender.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Release'">
<Reference Include="Bovender, Version=0.5.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<Reference Include="Bovender, Version=0.5.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Bovender.0.5.0.0\lib\net40\Bovender.dll</HintPath>
<HintPath>..\packages\Bovender.0.5.1.0\lib\net40\Bovender.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion XLToolboxForExcel/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
limitations under the License.
-->
<packages>
<package id="Bovender" version="0.5.0.0" targetFramework="net40" />
<package id="Bovender" version="0.5.1.0" targetFramework="net40" />
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
</packages>
2 changes: 1 addition & 1 deletion publish/VstoAddinInstaller
Submodule VstoAddinInstaller updated 31 files
+12 −15 README.md
+38 −0 demo/VstoInstallerDemoOutlook/Properties/AssemblyInfo.cs
+62 −0 demo/VstoInstallerDemoOutlook/Properties/Resources.Designer.cs
+117 −0 demo/VstoInstallerDemoOutlook/Properties/Resources.resx
+38 −0 demo/VstoInstallerDemoOutlook/Properties/Settings.Designer.cs
+9 −0 demo/VstoInstallerDemoOutlook/Properties/Settings.settings
+286 −0 demo/VstoInstallerDemoOutlook/ThisAddIn.Designer.cs
+4 −0 demo/VstoInstallerDemoOutlook/ThisAddIn.Designer.xml
+49 −0 demo/VstoInstallerDemoOutlook/ThisAddIn.cs
+225 −0 demo/VstoInstallerDemoOutlook/VstoInstallerDemoOutlook.csproj
+22 −0 demo/VstoInstallerDemoOutlook/VstoInstallerDemoOutlook.sln
+ − demo/VstoInstallerDemoOutlook/VstoInstallerDemoOutlook_TemporaryKey.pfx
+15 −0 demo/VstoInstallerDemoOutlook/app.config
+38 −0 demo/VstoInstallerDemoPowerPoint/Properties/AssemblyInfo.cs
+62 −0 demo/VstoInstallerDemoPowerPoint/Properties/Resources.Designer.cs
+117 −0 demo/VstoInstallerDemoPowerPoint/Properties/Resources.resx
+38 −0 demo/VstoInstallerDemoPowerPoint/Properties/Settings.Designer.cs
+9 −0 demo/VstoInstallerDemoPowerPoint/Properties/Settings.settings
+231 −0 demo/VstoInstallerDemoPowerPoint/ThisAddIn.Designer.cs
+4 −0 demo/VstoInstallerDemoPowerPoint/ThisAddIn.Designer.xml
+42 −0 demo/VstoInstallerDemoPowerPoint/ThisAddIn.cs
+221 −0 demo/VstoInstallerDemoPowerPoint/VstoInstallerDemoPowerPoint.csproj
+22 −0 demo/VstoInstallerDemoPowerPoint/VstoInstallerDemoPowerPoint.sln
+ − demo/VstoInstallerDemoPowerPoint/VstoInstallerDemoPowerPoint_TemporaryKey.pfx
+15 −0 demo/VstoInstallerDemoPowerPoint/app.config
+37 −0 demo/make-installer-outlook.iss
+37 −0 demo/make-installer-powerpoint.iss
+13 −15 inc/code.iss
+1 −8 inc/environment.iss
+2 −9 inc/helpers.iss
+2 −2 vsto-installer.iss
Loading

0 comments on commit f06ca4c

Please sign in to comment.