Skip to content

Commit

Permalink
Merge pull request #91 from augustoproiete/update-projects-to-target-…
Browse files Browse the repository at this point in the history
…exceldna-v1.1.0-beta2

Update all projects to target ExcelDna v1.1.0-beta2
  • Loading branch information
govert authored Jun 24, 2020
2 parents b2e9586 + 3eaba32 commit 14105de
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions NuGet/ExcelDna.IntelliSense/ExcelDna.IntelliSense.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>ExcelDna.IntelliSense</id>
<version>1.3.0-beta1</version>
<version>1.3.0-beta2</version>
<title>Excel-DNA IntelliSense Extension</title>
<authors>Excel-DNA Contributors</authors>
<owners>Excel-DNA Contributors</owners>
Expand All @@ -14,7 +14,7 @@
<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>
<tags>excel exceldna udf excel-dna intellisense</tags>
<dependencies>
<dependency id="ExcelDna.Integration" version="[1.1.0-beta1]" />
<dependency id="ExcelDna.Integration" version="1.1.0-beta2" />
</dependencies>
</metadata>
<files>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta1\lib\ExcelDna.Integration.dll</HintPath>
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta2\lib\ExcelDna.Integration.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -68,12 +68,12 @@
<None Include="App.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<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')" />
<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')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<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'))" />
<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'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
4 changes: 2 additions & 2 deletions Source/ExcelDna.IntelliSense.Host/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ExcelDna.AddIn" version="1.1.0-beta1" targetFramework="net40" developmentDependency="true" />
<package id="ExcelDna.Integration" version="1.1.0-beta1" targetFramework="net40" />
<package id="ExcelDna.AddIn" version="1.1.0-beta2" targetFramework="net40" developmentDependency="true" />
<package id="ExcelDna.Integration" version="1.1.0-beta2" targetFramework="net40" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta1\lib\ExcelDna.Integration.dll</HintPath>
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta2\lib\ExcelDna.Integration.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
Expand All @@ -55,12 +55,12 @@
<None Include="ExcelDna.IntelliSense.Tools-AddIn.dna" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<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')" />
<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')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<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'))" />
<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'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
4 changes: 2 additions & 2 deletions Source/ExcelDna.IntelliSense.Tools/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ExcelDna.AddIn" version="1.1.0-beta1" targetFramework="net45" developmentDependency="true" />
<package id="ExcelDna.Integration" version="1.1.0-beta1" targetFramework="net45" />
<package id="ExcelDna.AddIn" version="1.1.0-beta2" targetFramework="net45" developmentDependency="true" />
<package id="ExcelDna.Integration" version="1.1.0-beta2" targetFramework="net45" />
</packages>
4 changes: 2 additions & 2 deletions Source/ExcelDna.IntelliSense/ExcelDna.IntelliSense.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta1\lib\ExcelDna.Integration.dll</HintPath>
<Private>False</Private>
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta2\lib\ExcelDna.Integration.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<EmbedInteropTypes>True</EmbedInteropTypes>
Expand Down
2 changes: 1 addition & 1 deletion Source/ExcelDna.IntelliSense/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ExcelDna.Integration" version="1.1.0-beta1" targetFramework="net40" />
<package id="ExcelDna.Integration" version="1.1.0-beta2" targetFramework="net40" />
<package id="ExcelDna.Interop" version="14.0.1" targetFramework="net40" />
</packages>

0 comments on commit 14105de

Please sign in to comment.