Skip to content

Commit 393dfe2

Browse files
govertgovert
committed
Update ExcelDna packages to v1.2.3-preview
IntelliSenseServer v1.4.3
1 parent 1d83af9 commit 393dfe2

File tree

15 files changed

+51
-38
lines changed

15 files changed

+51
-38
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.4.2</version>
5+
<version>1.4.3-test</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="1.1.0" />
17+
<dependency id="ExcelDna.Integration" version="1.2.3-preview" />
1818
</dependencies>
1919
</metadata>
2020
<files>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<system.diagnostics>
44
<trace autoflush="true" indentsize="4"/>
@@ -16,4 +16,4 @@
1616
</source>
1717
</sources>
1818
</system.diagnostics>
19-
</configuration>
19+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>ExcelDna.IntelliSense.Host</RootNamespace>
1111
<AssemblyName>ExcelDna.IntelliSense.Host</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
<SignAssembly>true</SignAssembly>
@@ -25,6 +25,7 @@
2525
<DefineConstants>DEBUG;TRACE</DefineConstants>
2626
<ErrorReport>prompt</ErrorReport>
2727
<WarningLevel>4</WarningLevel>
28+
<Prefer32Bit>false</Prefer32Bit>
2829
</PropertyGroup>
2930
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3031
<DebugType>pdbonly</DebugType>
@@ -33,10 +34,11 @@
3334
<DefineConstants>TRACE</DefineConstants>
3435
<ErrorReport>prompt</ErrorReport>
3536
<WarningLevel>4</WarningLevel>
37+
<Prefer32Bit>false</Prefer32Bit>
3638
</PropertyGroup>
3739
<ItemGroup>
3840
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
39-
<HintPath>..\packages\ExcelDna.Integration.1.1.0\lib\ExcelDna.Integration.dll</HintPath>
41+
<HintPath>..\packages\ExcelDna.Integration.1.2.3-preview\lib\ExcelDna.Integration.dll</HintPath>
4042
</Reference>
4143
<Reference Include="System" />
4244
<Reference Include="System.Core" />
@@ -69,12 +71,12 @@
6971
<None Include="App.config" />
7072
</ItemGroup>
7173
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
72-
<Import Project="..\packages\ExcelDna.AddIn.1.1.0\build\ExcelDna.AddIn.targets" Condition="Exists('..\packages\ExcelDna.AddIn.1.1.0\build\ExcelDna.AddIn.targets')" />
74+
<Import Project="..\packages\ExcelDna.AddIn.1.2.3-preview\build\ExcelDna.AddIn.targets" Condition="Exists('..\packages\ExcelDna.AddIn.1.2.3-preview\build\ExcelDna.AddIn.targets')" />
7375
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
7476
<PropertyGroup>
7577
<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>
7678
</PropertyGroup>
77-
<Error Condition="!Exists('..\packages\ExcelDna.AddIn.1.1.0\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ExcelDna.AddIn.1.1.0\build\ExcelDna.AddIn.targets'))" />
79+
<Error Condition="!Exists('..\packages\ExcelDna.AddIn.1.2.3-preview\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ExcelDna.AddIn.1.2.3-preview\build\ExcelDna.AddIn.targets'))" />
7880
</Target>
7981
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8082
Other similar extension points exist, see Microsoft.Common.targets.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.4.2.0")]
35-
[assembly: AssemblyFileVersion("1.4.2.0")]
36-
[assembly: AssemblyInformationalVersion("1.4.2")]
34+
[assembly: AssemblyVersion("1.4.3.0")]
35+
[assembly: AssemblyFileVersion("1.4.3.0")]
36+
[assembly: AssemblyInformationalVersion("1.4.3")]

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@
5252
<ExcelDna64BitAddInSuffix Condition="'$(ExcelDna64BitAddInSuffix)' == ''">64</ExcelDna64BitAddInSuffix>
5353
</PropertyGroup>
5454

55+
<PropertyGroup>
56+
<!--
57+
Enable/Disable using Excel-DNA with PackageReference projects (not officially supported)
58+
-->
59+
<ExcelDnaAllowPackageReferenceProjectStyle Condition="'$(ExcelDnaAllowPackageReferenceProjectStyle)' == ''">false</ExcelDnaAllowPackageReferenceProjectStyle>
60+
</PropertyGroup>
61+
5562
<!--
5663
Configuration properties for packing .dna files
5764
-->

‎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="1.1.0" targetFramework="net40" developmentDependency="true" />
4-
<package id="ExcelDna.Integration" version="1.1.0" targetFramework="net40" />
3+
<package id="ExcelDna.AddIn" version="1.2.3-preview" targetFramework="net40" developmentDependency="true" />
4+
<package id="ExcelDna.Integration" version="1.2.3-preview" targetFramework="net40" />
55
</packages>

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>ExcelDna.IntelliSense.Tools</RootNamespace>
1111
<AssemblyName>ExcelDna.IntelliSense.Tools</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SignAssembly>true</SignAssembly>
1515
<AssemblyOriginatorKeyFile>..\assets\exceldna.snk</AssemblyOriginatorKeyFile>
1616
<NuGetPackageImportStamp>
1717
</NuGetPackageImportStamp>
18+
<TargetFrameworkProfile />
1819
</PropertyGroup>
1920
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2021
<DebugSymbols>true</DebugSymbols>
@@ -35,7 +36,7 @@
3536
</PropertyGroup>
3637
<ItemGroup>
3738
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
38-
<HintPath>..\packages\ExcelDna.Integration.1.1.0\lib\ExcelDna.Integration.dll</HintPath>
39+
<HintPath>..\packages\ExcelDna.Integration.1.2.3-preview\lib\ExcelDna.Integration.dll</HintPath>
3940
</Reference>
4041
<Reference Include="System" />
4142
<Reference Include="System.Core" />
@@ -56,12 +57,12 @@
5657
<None Include="ExcelDna.IntelliSense.Tools-AddIn.dna" />
5758
</ItemGroup>
5859
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
59-
<Import Project="..\packages\ExcelDna.AddIn.1.1.0\build\ExcelDna.AddIn.targets" Condition="Exists('..\packages\ExcelDna.AddIn.1.1.0\build\ExcelDna.AddIn.targets')" />
60+
<Import Project="..\packages\ExcelDna.AddIn.1.2.3-preview\build\ExcelDna.AddIn.targets" Condition="Exists('..\packages\ExcelDna.AddIn.1.2.3-preview\build\ExcelDna.AddIn.targets')" />
6061
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
6162
<PropertyGroup>
6263
<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>
6364
</PropertyGroup>
64-
<Error Condition="!Exists('..\packages\ExcelDna.AddIn.1.1.0\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ExcelDna.AddIn.1.1.0\build\ExcelDna.AddIn.targets'))" />
65+
<Error Condition="!Exists('..\packages\ExcelDna.AddIn.1.2.3-preview\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ExcelDna.AddIn.1.2.3-preview\build\ExcelDna.AddIn.targets'))" />
6566
</Target>
6667
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6768
Other similar extension points exist, see Microsoft.Common.targets.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.4.2.0")]
35-
[assembly: AssemblyFileVersion("1.4.2.0")]
36-
[assembly: AssemblyInformationalVersion("1.4.2")]
34+
[assembly: AssemblyVersion("1.4.3.0")]
35+
[assembly: AssemblyFileVersion("1.4.3.0")]
36+
[assembly: AssemblyInformationalVersion("1.4.3")]

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@
5252
<ExcelDna64BitAddInSuffix Condition="'$(ExcelDna64BitAddInSuffix)' == ''">64</ExcelDna64BitAddInSuffix>
5353
</PropertyGroup>
5454

55+
<PropertyGroup>
56+
<!--
57+
Enable/Disable using Excel-DNA with PackageReference projects (not officially supported)
58+
-->
59+
<ExcelDnaAllowPackageReferenceProjectStyle Condition="'$(ExcelDnaAllowPackageReferenceProjectStyle)' == ''">false</ExcelDnaAllowPackageReferenceProjectStyle>
60+
</PropertyGroup>
61+
5562
<!--
5663
Configuration properties for packing .dna files
5764
-->

‎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="1.1.0" targetFramework="net45" developmentDependency="true" />
4-
<package id="ExcelDna.Integration" version="1.1.0" targetFramework="net45" />
3+
<package id="ExcelDna.AddIn" version="1.2.3-preview" targetFramework="net45" developmentDependency="true" />
4+
<package id="ExcelDna.Integration" version="1.2.3-preview" targetFramework="net45" />
55
</packages>

0 commit comments

Comments
 (0)