Skip to content

Commit

Permalink
Excel-DNA Registration Version 1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
govert committed Jun 28, 2020
1 parent e2bb0a1 commit 8224ad7
Show file tree
Hide file tree
Showing 24 changed files with 89 additions and 69 deletions.
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.Registration.FSharp</id>
<version>1.1.0-beta2</version>
<version>1.1.0</version>
<title>Excel-DNA Registration Extensions for F#</title>
<authors>Govert van Drimmelen</authors>
<owners>Govert van Drimmelen</owners>
Expand All @@ -15,8 +15,8 @@
<summary>Excel-DNA Registration provides custom registration and function transformation helpers to Excel-DNA add-ins.</summary>
<tags>excel exceldna udf excel-dna</tags>
<dependencies>
<dependency id="ExcelDna.Integration" version="1.1.0-beta2" />
<dependency id="ExcelDna.Registration" version="1.1.0-beta2" />
<dependency id="ExcelDna.Integration" version="1.1.0" />
<dependency id="ExcelDna.Registration" version="1.1.0" />
<dependency id="ExcelDna.Interop" version="14.0.0" />
</dependencies>
</metadata>
Expand Down
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.Registration.VisualBasic</id>
<version>1.1.0-beta2</version>
<version>1.1.0</version>
<title>Excel-DNA Registration Extensions for Visual Basic</title>
<authors>Govert van Drimmelen</authors>
<owners>Govert van Drimmelen</owners>
Expand All @@ -15,8 +15,8 @@
<summary>Excel-DNA Registration provides custom registration and function transformation helpers to Excel-DNA add-ins.</summary>
<tags>excel exceldna udf excel-dna</tags>
<dependencies>
<dependency id="ExcelDna.Integration" version="1.1.0-beta2" />
<dependency id="ExcelDna.Registration" version="1.1.0-beta2" />
<dependency id="ExcelDna.Integration" version="1.1.0" />
<dependency id="ExcelDna.Registration" version="1.1.0" />
<dependency id="ExcelDna.Interop" version="14.0.0" />
</dependencies>
</metadata>
Expand Down
4 changes: 2 additions & 2 deletions NuGet/ExcelDna.Registration/ExcelDna.Registration.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.Registration</id>
<version>1.1.0-beta2</version>
<version>1.1.0</version>
<title>Excel-DNA Registration Extensions</title>
<authors>Govert van Drimmelen</authors>
<owners>Govert van Drimmelen</owners>
Expand All @@ -14,7 +14,7 @@
<summary>Excel-DNA Registration provides custom registration and function transformation helpers to Excel-DNA add-ins.</summary>
<tags>excel exceldna udf excel-dna</tags>
<dependencies>
<dependency id="ExcelDna.Integration" version="1.1.0-beta2" />
<dependency id="ExcelDna.Integration" version="1.1.0" />
</dependencies>
</metadata>
<files>
Expand Down
6 changes: 3 additions & 3 deletions Source/ExcelDna.Registration.FSharp/AssemblyInfo.fs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

open System.Reflection

[<assembly: AssemblyVersion("1.0.0.0")>]
[<assembly: AssemblyFileVersion("1.0.0.0")>]
[<assembly: AssemblyInformationalVersion("1.0.0")>]
[<assembly: AssemblyVersion("1.1.0.0")>]
[<assembly: AssemblyFileVersion("1.1.0.0")>]
[<assembly: AssemblyInformationalVersion("1.1.0")>]
do()
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,10 @@
</ItemGroup>
<ItemGroup>
<Reference Include="ExcelDna.Integration">
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta2\lib\ExcelDna.Integration.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\ExcelDna.Integration.1.1.0\lib\ExcelDna.Integration.dll</HintPath>
</Reference>
<Reference Include="FSharp.Core">
<HintPath>..\packages\FSharp.Core.4.6.2\lib\net45\FSharp.Core.dll</HintPath>
<HintPath>..\packages\FSharp.Core.4.7.2\lib\net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="System" />
Expand Down
4 changes: 2 additions & 2 deletions Source/ExcelDna.Registration.FSharp/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-beta2" targetFramework="net45" />
<package id="FSharp.Core" version="4.6.2" targetFramework="net45" />
<package id="ExcelDna.Integration" version="1.1.0" targetFramework="net45" />
<package id="FSharp.Core" version="4.7.2" targetFramework="net45" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,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-beta2\lib\ExcelDna.Integration.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\ExcelDna.Integration.1.1.0\lib\ExcelDna.Integration.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<EmbedInteropTypes>True</EmbedInteropTypes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("")>
<Assembly: AssemblyProduct("ExcelDna.Registration.VisualBasic")>
<Assembly: AssemblyCopyright("Copyright © 2015-2019")>
<Assembly: AssemblyCopyright("Copyright © 2015-2020")>
<Assembly: AssemblyTrademark("")>

<Assembly: ComVisible(False)>
Expand All @@ -31,6 +31,6 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("1.0.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: AssemblyInformationalVersion("1.0.0")>
<Assembly: AssemblyVersion("1.1.0.0")>
<Assembly: AssemblyFileVersion("1.1.0.0")>
<Assembly: AssemblyInformationalVersion("1.1.0")>
2 changes: 1 addition & 1 deletion Source/ExcelDna.Registration.VisualBasic/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-beta2" targetFramework="net40" />
<package id="ExcelDna.Integration" version="1.1.0" targetFramework="net40" />
<package id="ExcelDna.Interop" version="14.0.1" targetFramework="net4" />
</packages>
3 changes: 1 addition & 2 deletions Source/ExcelDna.Registration/ExcelDna.Registration.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +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-beta2\lib\ExcelDna.Integration.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\ExcelDna.Integration.1.1.0\lib\ExcelDna.Integration.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
8 changes: 4 additions & 4 deletions Source/ExcelDna.Registration/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ExcelDna.Registration")]
[assembly: AssemblyCopyright("Copyright © 2015-2019")]
[assembly: AssemblyCopyright("Copyright © 2015-2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,6 +32,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyInformationalVersion("1.0.0")]
[assembly: AssemblyVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
[assembly: AssemblyInformationalVersion("1.1.0")]
2 changes: 1 addition & 1 deletion Source/ExcelDna.Registration/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ExcelDna.Integration" version="1.1.0-beta2" targetFramework="net40" />
<package id="ExcelDna.Integration" version="1.1.0" targetFramework="net40" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -25,7 +27,7 @@
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Debug\Registration.Sample.FSharp.XML</DocumentationFile>
<StartAction>Program</StartAction>
<StartProgram>C:\Program Files (x86)\Microsoft Office\Root\Office16\EXCEL.EXE</StartProgram>
<StartProgram>C:\Program Files (x86)\Microsoft Office\root\Office16\EXCEL.EXE</StartProgram>
<StartArguments>"Registration.Sample.FSharp-AddIn.xll"</StartArguments>
<RemoteDebugEnabled>false</RemoteDebugEnabled>
</PropertyGroup>
Expand All @@ -37,6 +39,9 @@
<DefineConstants>TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Release\ExcelDna.CustomRegistration.FSharpExample.XML</DocumentationFile>
<StartAction>Program</StartAction>
<StartProgram>C:\Program Files (x86)\Microsoft Office\root\Office16\EXCEL.EXE</StartProgram>
<StartArguments>"Registration.Sample.FSharp-AddIn.xll"</StartArguments>
</PropertyGroup>
<PropertyGroup>
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
Expand Down Expand Up @@ -105,12 +110,14 @@
</ItemGroup>
<ItemGroup>
<Reference Include="ExcelDna.Integration">
<HintPath>..\..\packages\ExcelDna.Integration.1.1.0-beta2\lib\ExcelDna.Integration.dll</HintPath>
<Private>False</Private>
<HintPath>..\..\packages\ExcelDna.Integration.1.1.0\lib\ExcelDna.Integration.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ExcelDna.Integration" />
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.6.2\lib\net45\FSharp.Core.dll</HintPath>
<HintPath>..\..\packages\FSharp.Core.4.7.2\lib\net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="FSharp.Core" />
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -126,12 +133,12 @@
<Private>True</Private>
</ProjectReference>
</ItemGroup>
<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')" />
<Import Project="..\..\packages\ExcelDna.AddIn.1.1.0\build\ExcelDna.AddIn.targets" Condition="Exists('..\..\packages\ExcelDna.AddIn.1.1.0\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-beta2\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\ExcelDna.AddIn.1.1.0-beta2\build\ExcelDna.AddIn.targets'))" />
<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'))" />
</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
6 changes: 3 additions & 3 deletions Source/Samples/Registration.Sample.FSharp/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ExcelDna.AddIn" version="1.1.0-beta2" targetFramework="net45" developmentDependency="true" />
<package id="ExcelDna.Integration" version="1.1.0-beta2" targetFramework="net45" />
<package id="FSharp.Core" version="4.6.2" targetFramework="net45" />
<package id="ExcelDna.AddIn" version="1.1.0" targetFramework="net45" developmentDependency="true" />
<package id="ExcelDna.Integration" version="1.1.0" targetFramework="net45" />
<package id="FSharp.Core" version="4.7.2" targetFramework="net45" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyTitle("Registration.Sample.VisualBasic")>
<Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("")>
<Assembly: AssemblyProduct("Registration.Sample.VisualBasic")>
<Assembly: AssemblyCopyright("Copyright © 2015")>
<Assembly: AssemblyProduct("Registration.Sample.VisualBasic")>
<Assembly: AssemblyCopyright("Copyright © 2015-2020")>
<Assembly: AssemblyTrademark("")>

<Assembly: ComVisible(False)>

'The following GUID is for the ID of the typelib if this project is exposed to COM
<Assembly: Guid("e9831df3-5557-494c-9da8-557d30621885")>
<Assembly: Guid("e9831df3-5557-494c-9da8-557d30621885")>

' Version information for an assembly consists of the following four values:
'
Expand All @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("1.0.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: AssemblyVersion("1.1.0.0")>
<Assembly: AssemblyFileVersion("1.1.0.0")>
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
<TargetFrameworkProfile />
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\assets\exceldna.snk</AssemblyOriginatorKeyFile>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -50,8 +52,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-beta2\lib\ExcelDna.Integration.dll</HintPath>
<Private>False</Private>
<HintPath>..\..\packages\ExcelDna.Integration.1.1.0\lib\ExcelDna.Integration.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<EmbedInteropTypes>True</EmbedInteropTypes>
Expand Down Expand Up @@ -152,12 +153,12 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<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')" />
<Import Project="..\..\packages\ExcelDna.AddIn.1.1.0\build\ExcelDna.AddIn.targets" Condition="Exists('..\..\packages\ExcelDna.AddIn.1.1.0\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-beta2\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\ExcelDna.AddIn.1.1.0-beta2\build\ExcelDna.AddIn.targets'))" />
<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'))" />
</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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ExcelDna.AddIn" version="1.1.0-beta2" targetFramework="net451" developmentDependency="true" />
<package id="ExcelDna.Integration" version="1.1.0-beta2" targetFramework="net451" />
<package id="ExcelDna.AddIn" version="1.1.0" targetFramework="net451" developmentDependency="true" />
<package id="ExcelDna.Integration" version="1.1.0" targetFramework="net451" />
<package id="ExcelDna.Interop" version="14.0.1" targetFramework="net451" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,12 @@ public static string dnaNullableBoolean(bool? val)
return val.HasValue ? "VAL: " + val : "NULL";
}

[ExcelFunction]
public static string dnaNullableOptionalDateTime(DateTime? val = null)
{
return val.HasValue ? "VAL: " + val : "NULL";
}

public enum TestEnum1
{
Negative,
Expand Down
6 changes: 3 additions & 3 deletions Source/Samples/Registration.Sample/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Registration.Sample")]
[assembly: AssemblyCopyright("Copyright © 2015-2017")]
[assembly: AssemblyCopyright("Copyright © 2015-2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
9 changes: 5 additions & 4 deletions Source/Samples/Registration.Sample/Registration.Sample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
<TargetFrameworkProfile />
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\assets\exceldna.snk</AssemblyOriginatorKeyFile>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -37,8 +39,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-beta2\lib\ExcelDna.Integration.dll</HintPath>
<Private>False</Private>
<HintPath>..\..\packages\ExcelDna.Integration.1.1.0\lib\ExcelDna.Integration.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -89,12 +90,12 @@ xcopy "$(SolutionDir)\packages\Excel-DNA.0.32.0-rc3-1\tools\ExcelDna64.xll" "$(T
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<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')" />
<Import Project="..\..\packages\ExcelDna.AddIn.1.1.0\build\ExcelDna.AddIn.targets" Condition="Exists('..\..\packages\ExcelDna.AddIn.1.1.0\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-beta2\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\ExcelDna.AddIn.1.1.0-beta2\build\ExcelDna.AddIn.targets'))" />
<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'))" />
</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/Samples/Registration.Sample/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-beta2" targetFramework="net451" developmentDependency="true" />
<package id="ExcelDna.Integration" version="1.1.0-beta2" targetFramework="net451" />
<package id="ExcelDna.AddIn" version="1.1.0" targetFramework="net451" developmentDependency="true" />
<package id="ExcelDna.Integration" version="1.1.0" targetFramework="net451" />
</packages>
Loading

0 comments on commit 8224ad7

Please sign in to comment.