Skip to content

Commit 74b8036

Browse files
govertgovert
committed
2 parents 1db605b + 14105de commit 74b8036

File tree

17 files changed

+198
-56
lines changed

17 files changed

+198
-56
lines changed

‎NuGet/ExcelDna.IntelliSense/ExcelDna.IntelliSense.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>ExcelDna.IntelliSense</id>
5-
<version>1.1.0</version>
5+
<version>1.3.0-beta2</version>
66
<title>Excel-DNA IntelliSense Extension</title>
77
<authors>Excel-DNA Contributors</authors>
88
<owners>Excel-DNA Contributors</owners>
@@ -14,7 +14,7 @@
1414
<summary>Excel-DNA IntelliSense is an extension library that can be added to an Excel-DNA add-in to provide an integrated IntelliSense server, providing IntelliSense services for all loaded Excel-DNA add-ins and appropriately configured VBA functions.</summary>
1515
<tags>excel exceldna udf excel-dna intellisense</tags>
1616
<dependencies>
17-
<dependency id="ExcelDna.Integration" version="0.33.9" />
17+
<dependency id="ExcelDna.Integration" version="1.1.0-beta2" />
1818
</dependencies>
1919
</metadata>
2020
<files>

‎Source/ExcelDna.IntelliSense.Host/ExcelDna.IntelliSense.Host-AddIn.xll.config‎ renamed to ‎Source/ExcelDna.IntelliSense.Host/App.config‎

File renamed without changes.

‎Source/ExcelDna.IntelliSense.Host/ExcelDna.IntelliSense.Host.csproj‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
15+
<SignAssembly>true</SignAssembly>
16+
<AssemblyOriginatorKeyFile>..\assets\exceldna.snk</AssemblyOriginatorKeyFile>
1517
</PropertyGroup>
1618
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1719
<DebugSymbols>true</DebugSymbols>
@@ -31,8 +33,8 @@
3133
<WarningLevel>4</WarningLevel>
3234
</PropertyGroup>
3335
<ItemGroup>
34-
<Reference Include="ExcelDna.Integration, Version=0.33.5730.40390, Culture=neutral, processorArchitecture=MSIL">
35-
<HintPath>..\packages\ExcelDna.Integration.0.33.9\lib\ExcelDna.Integration.dll</HintPath>
36+
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
37+
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta2\lib\ExcelDna.Integration.dll</HintPath>
3638
<Private>False</Private>
3739
</Reference>
3840
<Reference Include="System" />
@@ -55,29 +57,24 @@
5557
</ProjectReference>
5658
</ItemGroup>
5759
<ItemGroup>
58-
<Content Include="ExcelDna.IntelliSense.Host-AddIn.dna">
59-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
60-
</Content>
60+
<None Include="packages.config" />
61+
<None Include="Properties\ExcelDna.Build.props" />
62+
<None Include="ExcelDna.IntelliSense.Host-AddIn.dna" />
6163
<Content Include="ExcelDna.IntelliSense.Host-AddIn.IntelliSense.xml">
6264
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6365
</Content>
6466
</ItemGroup>
6567
<ItemGroup>
66-
<None Include="ExcelDna.IntelliSense.Host-AddIn.xll.config">
67-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
68-
</None>
69-
<None Include="packages.config" />
68+
<None Include="App.config" />
7069
</ItemGroup>
7170
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
72-
<PropertyGroup>
73-
<PostBuildEvent>copy $(ProjectDir)..\ExcelDna.IntelliSense.xll $(TargetDir)ExcelDna.CustomAddin.xll
74-
xcopy "$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDna.xll" "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn.xll*" /C /Y
75-
xcopy "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn.dna*" "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn64.dna*" /C /Y
76-
xcopy "$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDna64.xll" "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn64.xll*" /C /Y
77-
"$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDnaPack.exe" "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn.dna" /Y /O "$(TargetDir)ExcelDna.IntelliSense.xll"
78-
"$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDnaPack.exe" "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn64.dna" /Y /O "$(TargetDir)ExcelDna.IntelliSense64.xll"
79-
xcopy "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn.xll.config" "$(TargetDir)ExcelDna.IntelliSense.xll.config*" /C /Y</PostBuildEvent>
80-
</PropertyGroup>
71+
<Import Project="..\packages\ExcelDna.AddIn.1.1.0-beta2\build\ExcelDna.AddIn.targets" Condition="Exists('..\packages\ExcelDna.AddIn.1.1.0-beta2\build\ExcelDna.AddIn.targets')" />
72+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
73+
<PropertyGroup>
74+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
75+
</PropertyGroup>
76+
<Error Condition="!Exists('..\packages\ExcelDna.AddIn.1.1.0-beta2\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ExcelDna.AddIn.1.1.0-beta2\build\ExcelDna.AddIn.targets'))" />
77+
</Target>
8178
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8279
Other similar extension points exist, see Microsoft.Common.targets.
8380
<Target Name="BeforeBuild">

‎Source/ExcelDna.IntelliSense.Host/Properties/AssemblyInfo.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Reflection;
2-
using System.Runtime.CompilerServices;
32
using System.Runtime.InteropServices;
43

54
// General Information about an assembly is controlled through the following
@@ -10,7 +9,7 @@
109
[assembly: AssemblyConfiguration("")]
1110
[assembly: AssemblyCompany("Excel-DNA")]
1211
[assembly: AssemblyProduct("Excel-DNA IntelliSense")]
13-
[assembly: AssemblyCopyright("Copyright © Excel-DNA Contributors 2013-2018")]
12+
[assembly: AssemblyCopyright("Copyright © Excel-DNA Contributors 2013-2019")]
1413
[assembly: AssemblyTrademark("")]
1514
[assembly: AssemblyCulture("")]
1615

@@ -32,5 +31,6 @@
3231
// You can specify all the values or you can default the Build and Revision Numbers
3332
// by using the '*' as shown below:
3433
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.1.0.*")]
36-
[assembly: AssemblyFileVersion("1.1.0.0")]
34+
[assembly: AssemblyVersion("1.2.0.0")]
35+
[assembly: AssemblyFileVersion("1.2.0.0")]
36+
[assembly: AssemblyInformationalVersion("1.2.0")]

‎Source/ExcelDna.IntelliSense.Host/Properties/ExcelDna.Build.props‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="ExcelDnaProps">
3+
<!--
4+
If you change properties in this file, they may not come into effect until you:
5+
* Rebuild the solution/project
6+
7+
or
8+
9+
* Close Visual Studio
10+
* Delete .vs folder, if exists
11+
* Delete ProjectName.csproj.user (or equivalent for VB, F#, etc.), if exists
12+
* Delete SolutionName.suo, if exists
13+
* Open your solution/project again in Visual Studio
14+
-->
15+
16+
<!--
17+
Configuration properties for debugging Excel-DNA add-ins
18+
-->
19+
<PropertyGroup>
20+
<!--
21+
Enable/Disable setting the debug options when building the project
22+
-->
23+
<RunExcelDnaSetDebuggerOptions Condition="'$(RunExcelDnaSetDebuggerOptions)' == ''">true</RunExcelDnaSetDebuggerOptions>
24+
25+
<!--
26+
Override the path of EXCEL.EXE used for debugging the project, if you need
27+
By default, it will use the latest version of Excel it can find on the machine
28+
-->
29+
<ExcelDnaExcelExePath Condition="'$(ExcelDnaExcelExePath)' == ''"></ExcelDnaExcelExePath>
30+
31+
<!--
32+
Override the name of the .XLL add-in to use when debugging the project, if you need
33+
By default, it will use the first unpacked .xll add-in that matches the bitness of EXCEL.EXE
34+
-->
35+
<ExcelDnaAddInForDebugging Condition="'$(ExcelDnaAddInForDebugging)' == ''"></ExcelDnaAddInForDebugging>
36+
</PropertyGroup>
37+
38+
<!--
39+
Configuration properties for building .dna files
40+
-->
41+
<PropertyGroup>
42+
<!--
43+
Enable/Disable automatic generation of platform-specific versions of .dna files
44+
-->
45+
<ExcelDnaCreate32BitAddIn Condition="'$(ExcelDnaCreate32BitAddIn)' == ''">true</ExcelDnaCreate32BitAddIn>
46+
<ExcelDnaCreate64BitAddIn Condition="'$(ExcelDnaCreate64BitAddIn)' == ''">true</ExcelDnaCreate64BitAddIn>
47+
48+
<!--
49+
Define the suffix used for each platform-specific file e.g. MyAddIn64.dna
50+
-->
51+
<ExcelDna32BitAddInSuffix Condition="'$(ExcelDna32BitAddInSuffix)' == ''"></ExcelDna32BitAddInSuffix>
52+
<ExcelDna64BitAddInSuffix Condition="'$(ExcelDna64BitAddInSuffix)' == ''">64</ExcelDna64BitAddInSuffix>
53+
</PropertyGroup>
54+
55+
<!--
56+
Configuration properties for packing .dna files
57+
-->
58+
<PropertyGroup>
59+
<!--
60+
Enable/Disable packing of .dna files
61+
-->
62+
<RunExcelDnaPack Condition="'$(RunExcelDnaPack)' == ''">true</RunExcelDnaPack>
63+
64+
<!--
65+
Suffix used for packed .xll files e.g. MyAddIn-packed.xll
66+
-->
67+
<ExcelDnaPackXllSuffix Condition="'$(ExcelDnaPackXllSuffix)' == ''">-packed</ExcelDnaPackXllSuffix>
68+
</PropertyGroup>
69+
</Project>
70+

‎Source/ExcelDna.IntelliSense.Host/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ExcelDna.AddIn" version="0.33.9" targetFramework="net40" />
4-
<package id="ExcelDna.Integration" version="0.33.9" targetFramework="net40" />
3+
<package id="ExcelDna.AddIn" version="1.1.0-beta2" targetFramework="net40" developmentDependency="true" />
4+
<package id="ExcelDna.Integration" version="1.1.0-beta2" targetFramework="net40" />
55
</packages>

‎Source/ExcelDna.IntelliSense.Tools/ExcelDna.IntelliSense.Tools.csproj‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<AssemblyName>ExcelDna.IntelliSense.Tools</AssemblyName>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<SignAssembly>true</SignAssembly>
15+
<AssemblyOriginatorKeyFile>..\assets\exceldna.snk</AssemblyOriginatorKeyFile>
1416
</PropertyGroup>
1517
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1618
<DebugSymbols>true</DebugSymbols>
@@ -30,8 +32,8 @@
3032
<WarningLevel>4</WarningLevel>
3133
</PropertyGroup>
3234
<ItemGroup>
33-
<Reference Include="ExcelDna.Integration, Version=0.33.5730.40390, Culture=neutral, processorArchitecture=MSIL">
34-
<HintPath>..\packages\ExcelDna.Integration.0.33.9\lib\ExcelDna.Integration.dll</HintPath>
35+
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
36+
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta2\lib\ExcelDna.Integration.dll</HintPath>
3537
<Private>False</Private>
3638
</Reference>
3739
<Reference Include="System" />
@@ -48,19 +50,18 @@
4850
<Compile Include="Properties\AssemblyInfo.cs" />
4951
</ItemGroup>
5052
<ItemGroup>
51-
<Content Include="ExcelDna.IntelliSense.Tools-AddIn.dna">
52-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
53-
</Content>
5453
<None Include="packages.config" />
54+
<None Include="Properties\ExcelDna.Build.props" />
55+
<None Include="ExcelDna.IntelliSense.Tools-AddIn.dna" />
5556
</ItemGroup>
5657
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
57-
<PropertyGroup>
58-
<PostBuildEvent>xcopy "$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDna.xll" "$(TargetDir)ExcelDna.IntelliSense.Tools-AddIn.xll*" /C /Y
59-
xcopy "$(TargetDir)ExcelDna.IntelliSense.Tools-AddIn.dna*" "$(TargetDir)ExcelDna.IntelliSense.Tools-AddIn64.dna*" /C /Y
60-
xcopy "$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDna64.xll" "$(TargetDir)ExcelDna.IntelliSense.Tools-AddIn64.xll*" /C /Y
61-
"$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDnaPack.exe" "$(TargetDir)ExcelDna.IntelliSense.Tools-AddIn.dna" /Y
62-
"$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDnaPack.exe" "$(TargetDir)ExcelDna.IntelliSense.Tools-AddIn64.dna" /Y</PostBuildEvent>
63-
</PropertyGroup>
58+
<Import Project="..\packages\ExcelDna.AddIn.1.1.0-beta2\build\ExcelDna.AddIn.targets" Condition="Exists('..\packages\ExcelDna.AddIn.1.1.0-beta2\build\ExcelDna.AddIn.targets')" />
59+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
60+
<PropertyGroup>
61+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
62+
</PropertyGroup>
63+
<Error Condition="!Exists('..\packages\ExcelDna.AddIn.1.1.0-beta2\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ExcelDna.AddIn.1.1.0-beta2\build\ExcelDna.AddIn.targets'))" />
64+
</Target>
6465
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6566
Other similar extension points exist, see Microsoft.Common.targets.
6667
<Target Name="BeforeBuild">

‎Source/ExcelDna.IntelliSense.Tools/Properties/AssemblyInfo.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Reflection;
2-
using System.Runtime.CompilerServices;
32
using System.Runtime.InteropServices;
43

54
// General Information about an assembly is controlled through the following
@@ -10,7 +9,7 @@
109
[assembly: AssemblyConfiguration("")]
1110
[assembly: AssemblyCompany("")]
1211
[assembly: AssemblyProduct("ExcelDna.IntelliSense.Tools")]
13-
[assembly: AssemblyCopyright("Copyright © Excel-DNA Contributors 2013-2018")]
12+
[assembly: AssemblyCopyright("Copyright © Excel-DNA Contributors 2013-2019")]
1413
[assembly: AssemblyTrademark("")]
1514
[assembly: AssemblyCulture("")]
1615

@@ -32,5 +31,6 @@
3231
// You can specify all the values or you can default the Build and Revision Numbers
3332
// by using the '*' as shown below:
3433
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.1.0.*")]
36-
[assembly: AssemblyFileVersion("1.1.0.0")]
34+
[assembly: AssemblyVersion("1.2.0.0")]
35+
[assembly: AssemblyFileVersion("1.2.0.0")]
36+
[assembly: AssemblyInformationalVersion("1.2.0")]

‎Source/ExcelDna.IntelliSense.Tools/Properties/ExcelDna.Build.props‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="ExcelDnaProps">
3+
<!--
4+
If you change properties in this file, they may not come into effect until you:
5+
* Rebuild the solution/project
6+
7+
or
8+
9+
* Close Visual Studio
10+
* Delete .vs folder, if exists
11+
* Delete ProjectName.csproj.user (or equivalent for VB, F#, etc.), if exists
12+
* Delete SolutionName.suo, if exists
13+
* Open your solution/project again in Visual Studio
14+
-->
15+
16+
<!--
17+
Configuration properties for debugging Excel-DNA add-ins
18+
-->
19+
<PropertyGroup>
20+
<!--
21+
Enable/Disable setting the debug options when building the project
22+
-->
23+
<RunExcelDnaSetDebuggerOptions Condition="'$(RunExcelDnaSetDebuggerOptions)' == ''">true</RunExcelDnaSetDebuggerOptions>
24+
25+
<!--
26+
Override the path of EXCEL.EXE used for debugging the project, if you need
27+
By default, it will use the latest version of Excel it can find on the machine
28+
-->
29+
<ExcelDnaExcelExePath Condition="'$(ExcelDnaExcelExePath)' == ''"></ExcelDnaExcelExePath>
30+
31+
<!--
32+
Override the name of the .XLL add-in to use when debugging the project, if you need
33+
By default, it will use the first unpacked .xll add-in that matches the bitness of EXCEL.EXE
34+
-->
35+
<ExcelDnaAddInForDebugging Condition="'$(ExcelDnaAddInForDebugging)' == ''"></ExcelDnaAddInForDebugging>
36+
</PropertyGroup>
37+
38+
<!--
39+
Configuration properties for building .dna files
40+
-->
41+
<PropertyGroup>
42+
<!--
43+
Enable/Disable automatic generation of platform-specific versions of .dna files
44+
-->
45+
<ExcelDnaCreate32BitAddIn Condition="'$(ExcelDnaCreate32BitAddIn)' == ''">true</ExcelDnaCreate32BitAddIn>
46+
<ExcelDnaCreate64BitAddIn Condition="'$(ExcelDnaCreate64BitAddIn)' == ''">true</ExcelDnaCreate64BitAddIn>
47+
48+
<!--
49+
Define the suffix used for each platform-specific file e.g. MyAddIn64.dna
50+
-->
51+
<ExcelDna32BitAddInSuffix Condition="'$(ExcelDna32BitAddInSuffix)' == ''"></ExcelDna32BitAddInSuffix>
52+
<ExcelDna64BitAddInSuffix Condition="'$(ExcelDna64BitAddInSuffix)' == ''">64</ExcelDna64BitAddInSuffix>
53+
</PropertyGroup>
54+
55+
<!--
56+
Configuration properties for packing .dna files
57+
-->
58+
<PropertyGroup>
59+
<!--
60+
Enable/Disable packing of .dna files
61+
-->
62+
<RunExcelDnaPack Condition="'$(RunExcelDnaPack)' == ''">true</RunExcelDnaPack>
63+
64+
<!--
65+
Suffix used for packed .xll files e.g. MyAddIn-packed.xll
66+
-->
67+
<ExcelDnaPackXllSuffix Condition="'$(ExcelDnaPackXllSuffix)' == ''">-packed</ExcelDnaPackXllSuffix>
68+
</PropertyGroup>
69+
</Project>
70+

‎Source/ExcelDna.IntelliSense.Tools/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ExcelDna.AddIn" version="0.33.9" targetFramework="net45" />
4-
<package id="ExcelDna.Integration" version="0.33.9" targetFramework="net45" />
3+
<package id="ExcelDna.AddIn" version="1.1.0-beta2" targetFramework="net45" developmentDependency="true" />
4+
<package id="ExcelDna.Integration" version="1.1.0-beta2" targetFramework="net45" />
55
</packages>

0 commit comments

Comments
 (0)