Skip to content

Commit bda6bfd

Browse files
authored
Merge pull request #88 from caioproiete/update-projects-to-target-exceldna-v1.1.0-beta1
Update all projects to target ExcelDna v1.1.0-beta
2 parents fe00169 + 4738bbd commit bda6bfd

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

NuGet/ExcelDna.IntelliSense/ExcelDna.IntelliSense.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.0.0" />
17+
<dependency id="ExcelDna.Integration" version="[1.1.0-beta1]" />
1818
</dependencies>
1919
</metadata>
2020
<files>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34-
<Reference Include="ExcelDna.Integration, Version=1.0.7056.37028, Culture=neutral, processorArchitecture=MSIL">
35-
<HintPath>..\packages\ExcelDna.Integration.1.0.0\lib\ExcelDna.Integration.dll</HintPath>
34+
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
35+
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta1\lib\ExcelDna.Integration.dll</HintPath>
3636
<Private>False</Private>
3737
</Reference>
3838
<Reference Include="System" />
@@ -66,12 +66,12 @@
6666
<None Include="App.config" />
6767
</ItemGroup>
6868
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
69-
<Import Project="..\packages\ExcelDna.AddIn.1.0.0\build\ExcelDna.AddIn.targets" Condition="Exists('..\packages\ExcelDna.AddIn.1.0.0\build\ExcelDna.AddIn.targets')" />
69+
<Import Project="..\packages\ExcelDna.AddIn.1.1.0-beta1\build\ExcelDna.AddIn.targets" Condition="Exists('..\packages\ExcelDna.AddIn.1.1.0-beta1\build\ExcelDna.AddIn.targets')" />
7070
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
7171
<PropertyGroup>
7272
<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>
7373
</PropertyGroup>
74-
<Error Condition="!Exists('..\packages\ExcelDna.AddIn.1.0.0\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ExcelDna.AddIn.1.0.0\build\ExcelDna.AddIn.targets'))" />
74+
<Error Condition="!Exists('..\packages\ExcelDna.AddIn.1.1.0-beta1\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ExcelDna.AddIn.1.1.0-beta1\build\ExcelDna.AddIn.targets'))" />
7575
</Target>
7676
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7777
Other similar extension points exist, see Microsoft.Common.targets.
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.0.0" targetFramework="net40" />
4-
<package id="ExcelDna.Integration" version="1.0.0" targetFramework="net40" />
3+
<package id="ExcelDna.AddIn" version="1.1.0-beta1" targetFramework="net40" developmentDependency="true" />
4+
<package id="ExcelDna.Integration" version="1.1.0-beta1" targetFramework="net40" />
55
</packages>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="ExcelDna.Integration, Version=1.0.7056.37028, Culture=neutral, processorArchitecture=MSIL">
34-
<HintPath>..\packages\ExcelDna.Integration.1.0.0\lib\ExcelDna.Integration.dll</HintPath>
33+
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
34+
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta1\lib\ExcelDna.Integration.dll</HintPath>
3535
<Private>False</Private>
3636
</Reference>
3737
<Reference Include="System" />
@@ -53,12 +53,12 @@
5353
<None Include="ExcelDna.IntelliSense.Tools-AddIn.dna" />
5454
</ItemGroup>
5555
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
56-
<Import Project="..\packages\ExcelDna.AddIn.1.0.0\build\ExcelDna.AddIn.targets" Condition="Exists('..\packages\ExcelDna.AddIn.1.0.0\build\ExcelDna.AddIn.targets')" />
56+
<Import Project="..\packages\ExcelDna.AddIn.1.1.0-beta1\build\ExcelDna.AddIn.targets" Condition="Exists('..\packages\ExcelDna.AddIn.1.1.0-beta1\build\ExcelDna.AddIn.targets')" />
5757
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
5858
<PropertyGroup>
5959
<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>
6060
</PropertyGroup>
61-
<Error Condition="!Exists('..\packages\ExcelDna.AddIn.1.0.0\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ExcelDna.AddIn.1.0.0\build\ExcelDna.AddIn.targets'))" />
61+
<Error Condition="!Exists('..\packages\ExcelDna.AddIn.1.1.0-beta1\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ExcelDna.AddIn.1.1.0-beta1\build\ExcelDna.AddIn.targets'))" />
6262
</Target>
6363
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6464
Other similar extension points exist, see Microsoft.Common.targets.
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.0.0" targetFramework="net45" />
4-
<package id="ExcelDna.Integration" version="1.0.0" targetFramework="net45" />
3+
<package id="ExcelDna.AddIn" version="1.1.0-beta1" targetFramework="net45" developmentDependency="true" />
4+
<package id="ExcelDna.Integration" version="1.1.0-beta1" targetFramework="net45" />
55
</packages>

Source/ExcelDna.IntelliSense/ExcelDna.IntelliSense.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="ExcelDna.Integration, Version=1.0.7056.37028, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\packages\ExcelDna.Integration.1.0.0\lib\ExcelDna.Integration.dll</HintPath>
37+
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
38+
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta1\lib\ExcelDna.Integration.dll</HintPath>
3939
<Private>False</Private>
4040
</Reference>
4141
<Reference Include="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
Lines changed: 1 addition & 1 deletion
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.Integration" version="1.0.0" targetFramework="net40" />
3+
<package id="ExcelDna.Integration" version="1.1.0-beta1" targetFramework="net40" />
44
<package id="ExcelDna.Interop" version="14.0.1" targetFramework="net40" />
55
</packages>

0 commit comments

Comments
 (0)