Skip to content

Commit 14105de

Browse files
authored
Merge pull request #91 from augustoproiete/update-projects-to-target-exceldna-v1.1.0-beta2
Update all projects to target ExcelDna v1.1.0-beta2
2 parents b2e9586 + 3eaba32 commit 14105de

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
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.3.0-beta1</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="[1.1.0-beta1]" />
17+
<dependency id="ExcelDna.Integration" version="1.1.0-beta2" />
1818
</dependencies>
1919
</metadata>
2020
<files>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</PropertyGroup>
3535
<ItemGroup>
3636
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
37-
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta1\lib\ExcelDna.Integration.dll</HintPath>
37+
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta2\lib\ExcelDna.Integration.dll</HintPath>
3838
<Private>False</Private>
3939
</Reference>
4040
<Reference Include="System" />
@@ -68,12 +68,12 @@
6868
<None Include="App.config" />
6969
</ItemGroup>
7070
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
71-
<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')" />
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')" />
7272
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
7373
<PropertyGroup>
7474
<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>
7575
</PropertyGroup>
76-
<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'))" />
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'))" />
7777
</Target>
7878
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7979
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.1.0-beta1" targetFramework="net40" developmentDependency="true" />
4-
<package id="ExcelDna.Integration" version="1.1.0-beta1" 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</PropertyGroup>
3434
<ItemGroup>
3535
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
36-
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta1\lib\ExcelDna.Integration.dll</HintPath>
36+
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta2\lib\ExcelDna.Integration.dll</HintPath>
3737
<Private>False</Private>
3838
</Reference>
3939
<Reference Include="System" />
@@ -55,12 +55,12 @@
5555
<None Include="ExcelDna.IntelliSense.Tools-AddIn.dna" />
5656
</ItemGroup>
5757
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
58-
<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')" />
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')" />
5959
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
6060
<PropertyGroup>
6161
<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>
6262
</PropertyGroup>
63-
<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'))" />
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'))" />
6464
</Target>
6565
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6666
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.1.0-beta1" targetFramework="net45" developmentDependency="true" />
4-
<package id="ExcelDna.Integration" version="1.1.0-beta1" 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>

Source/ExcelDna.IntelliSense/ExcelDna.IntelliSense.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
</PropertyGroup>
3838
<ItemGroup>
3939
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
40-
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta1\lib\ExcelDna.Integration.dll</HintPath>
41-
<Private>False</Private>
40+
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta2\lib\ExcelDna.Integration.dll</HintPath>
41+
<Private>True</Private>
4242
</Reference>
4343
<Reference Include="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
4444
<EmbedInteropTypes>True</EmbedInteropTypes>
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.1.0-beta1" targetFramework="net40" />
3+
<package id="ExcelDna.Integration" version="1.1.0-beta2" targetFramework="net40" />
44
<package id="ExcelDna.Interop" version="14.0.1" targetFramework="net40" />
55
</packages>

0 commit comments

Comments
 (0)