Skip to content

Commit

Permalink
Release v0.34.6
Browse files Browse the repository at this point in the history
  • Loading branch information
govert committed Jun 19, 2017
1 parent 55b5eb3 commit bdf9f68
Show file tree
Hide file tree
Showing 25 changed files with 57 additions and 57 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>0.34.1-beta2</version>
<version>0.34.6</version>
<title>Excel-DNA Registration Extensions for F#</title>
<authors>Govert van Drimmelen</authors>
<owners>Govert van Drimmelen</owners>
Expand All @@ -14,8 +14,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="0.33.9" />
<dependency id="ExcelDna.Registration" version="[0.34.1-beta2]" />
<dependency id="ExcelDna.Integration" version="0.34.6" />
<dependency id="ExcelDna.Registration" version="[0.34.6]" />
<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>0.34.1-beta2</version>
<version>0.34.6</version>
<title>Excel-DNA Registration Extensions for Visual Basic</title>
<authors>Govert van Drimmelen</authors>
<owners>Govert van Drimmelen</owners>
Expand All @@ -14,8 +14,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="0.33.9" />
<dependency id="ExcelDna.Registration" version="[0.34.1-beta2]" />
<dependency id="ExcelDna.Integration" version="0.34.6" />
<dependency id="ExcelDna.Registration" version="[0.34.6]" />
<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>0.34.1-beta2</version>
<version>0.34.6</version>
<title>Excel-DNA Registration Extensions</title>
<authors>Govert van Drimmelen</authors>
<owners>Govert van Drimmelen</owners>
Expand All @@ -13,7 +13,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="0.33.9" />
<dependency id="ExcelDna.Integration" version="0.34.6" />
</dependencies>
</metadata>
<files>
Expand Down
2 changes: 1 addition & 1 deletion Source/ExcelDna.Registration.FSharp/AssemblyInfo.fs
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
open System.Reflection

[<assembly: AssemblyVersion("0.34.*")>]
[<assembly: AssemblyFileVersion("0.34.1.2")>]
[<assembly: AssemblyFileVersion("0.34.6.1")>]
do()
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="ExcelDna.Integration">
<HintPath>..\packages\ExcelDna.Integration.0.34.1-beta\lib\ExcelDna.Integration.dll</HintPath>
<HintPath>..\packages\ExcelDna.Integration.0.34.6\lib\ExcelDna.Integration.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
Expand Down
2 changes: 1 addition & 1 deletion Source/ExcelDna.Registration.FSharp/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="0.34.1-beta" targetFramework="net40" />
<package id="ExcelDna.Integration" version="0.34.6" targetFramework="net40" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<ItemGroup>
<Reference Include="ExcelDna.Integration, Version=0.34.6161.41353, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ExcelDna.Integration.0.34.1-beta\lib\ExcelDna.Integration.dll</HintPath>
<Reference Include="ExcelDna.Integration, Version=0.34.6373.42344, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ExcelDna.Integration.0.34.6\lib\ExcelDna.Integration.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
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-2016")>
<Assembly: AssemblyCopyright("Copyright © 2015-2017")>
<Assembly: AssemblyTrademark("")>

<Assembly: ComVisible(False)>
Expand All @@ -32,4 +32,4 @@ Imports System.Runtime.InteropServices
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("0.34.*")>
<Assembly: AssemblyFileVersion("0.34.1.2")>
<Assembly: AssemblyFileVersion("0.34.6.1")>
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="0.34.1-beta" targetFramework="net40" />
<package id="ExcelDna.Integration" version="0.34.6" targetFramework="net40" />
<package id="ExcelDna.Interop" version="14.0.1" targetFramework="net4" />
</packages>
4 changes: 2 additions & 2 deletions Source/ExcelDna.Registration/ExcelDna.Registration.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="ExcelDna.Integration, Version=0.34.6161.41353, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ExcelDna.Integration.0.34.1-beta\lib\ExcelDna.Integration.dll</HintPath>
<Reference Include="ExcelDna.Integration, Version=0.34.6373.42344, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ExcelDna.Integration.0.34.6\lib\ExcelDna.Integration.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
Expand Down
4 changes: 2 additions & 2 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-2016")]
[assembly: AssemblyCopyright("Copyright © 2015-2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.34.*")]
[assembly: AssemblyFileVersion("0.34.1.2")]
[assembly: AssemblyFileVersion("0.34.6.1")]
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="0.34.1-beta" targetFramework="net40" />
<package id="ExcelDna.Integration" version="0.34.6" targetFramework="net40" />
</packages>
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="ExcelDnaProps">
<!--
If you change properties in this file, they may not come into effect until you:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Debug\Registration.Sample.FSharp.XML</DocumentationFile>
<StartAction>Program</StartAction>
<StartProgram>C:\Program Files (x86)\Microsoft Office\Office15\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 Down Expand Up @@ -104,7 +104,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="ExcelDna.Integration">
<HintPath>..\..\packages\ExcelDna.Integration.0.34.1-beta\lib\ExcelDna.Integration.dll</HintPath>
<HintPath>..\..\packages\ExcelDna.Integration.0.34.6\lib\ExcelDna.Integration.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
Expand All @@ -125,10 +125,10 @@
<Private>True</Private>
</ProjectReference>
</ItemGroup>
<Import Project="..\..\packages\ExcelDna.AddIn.0.34.1-beta\tools\ExcelDna.AddIn.targets" Condition="Exists('..\..\packages\ExcelDna.AddIn.0.34.1-beta\tools\ExcelDna.AddIn.targets')" />
<Import Project="..\..\packages\ExcelDna.AddIn.0.34.6\tools\ExcelDna.AddIn.targets" Condition="Exists('..\..\packages\ExcelDna.AddIn.0.34.6\tools\ExcelDna.AddIn.targets')" />
<Target Name="EnsureExcelDnaTargetsImported" BeforeTargets="BeforeBuild" Condition="'$(ExcelDnaTargetsImported)' == ''">
<Error Condition="!Exists('..\..\packages\ExcelDna.AddIn.0.34.1-beta\tools\ExcelDna.AddIn.targets') And ('$(RunExcelDnaBuild)' != '' And $(RunExcelDnaBuild))" Text="You are trying to build with ExcelDna, but the NuGet targets file that ExcelDna depends on is not available on this computer. This is probably because the ExcelDna package has not been committed to source control, or NuGet Package Restore is not enabled. Please enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
<Error Condition="Exists('..\..\packages\ExcelDna.AddIn.0.34.1-beta\tools\ExcelDna.AddIn.targets') And ('$(RunExcelDnaBuild)' != '' And $(RunExcelDnaBuild))" Text="ExcelDna cannot be run because NuGet packages were restored prior to the build running, and the targets file was unavailable when the build started. Please build the project again to include these packages in the build. You may also need to make sure that your build server does not delete packages prior to each build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
<Error Condition="!Exists('..\..\packages\ExcelDna.AddIn.0.34.6\tools\ExcelDna.AddIn.targets') And ('$(RunExcelDnaBuild)' != '' And $(RunExcelDnaBuild))" Text="You are trying to build with ExcelDna, but the NuGet targets file that ExcelDna depends on is not available on this computer. This is probably because the ExcelDna package has not been committed to source control, or NuGet Package Restore is not enabled. Please enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
<Error Condition="Exists('..\..\packages\ExcelDna.AddIn.0.34.6\tools\ExcelDna.AddIn.targets') And ('$(RunExcelDnaBuild)' != '' And $(RunExcelDnaBuild))" Text="ExcelDna cannot be run because NuGet packages were restored prior to the build running, and the targets file was unavailable when the build started. Please build the project again to include these packages in the build. You may also need to make sure that your build server does not delete packages prior to each build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
</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.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.AddIn" version="0.34.1-beta" targetFramework="net40" />
<package id="ExcelDna.Integration" version="0.34.1-beta" targetFramework="net40" />
<package id="ExcelDna.AddIn" version="0.34.6" targetFramework="net40" />
<package id="ExcelDna.Integration" version="0.34.6" targetFramework="net40" />
</packages>
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="ExcelDnaProps">
<!--
If you change properties in this file, they may not come into effect until you:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<ItemGroup>
<Reference Include="ExcelDna.Integration, Version=0.34.6161.41353, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\ExcelDna.Integration.0.34.1-beta\lib\ExcelDna.Integration.dll</HintPath>
<Reference Include="ExcelDna.Integration, Version=0.34.6373.42344, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\ExcelDna.Integration.0.34.6\lib\ExcelDna.Integration.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
Expand Down Expand Up @@ -150,10 +150,10 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Import Project="..\..\packages\ExcelDna.AddIn.0.34.1-beta\tools\ExcelDna.AddIn.targets" Condition="Exists('..\..\packages\ExcelDna.AddIn.0.34.1-beta\tools\ExcelDna.AddIn.targets')" />
<Import Project="..\..\packages\ExcelDna.AddIn.0.34.6\tools\ExcelDna.AddIn.targets" Condition="Exists('..\..\packages\ExcelDna.AddIn.0.34.6\tools\ExcelDna.AddIn.targets')" />
<Target Name="EnsureExcelDnaTargetsImported" BeforeTargets="BeforeBuild" Condition="'$(ExcelDnaTargetsImported)' == ''">
<Error Condition="!Exists('..\..\packages\ExcelDna.AddIn.0.34.1-beta\tools\ExcelDna.AddIn.targets') And ('$(RunExcelDnaBuild)' != '' And $(RunExcelDnaBuild))" Text="You are trying to build with ExcelDna, but the NuGet targets file that ExcelDna depends on is not available on this computer. This is probably because the ExcelDna package has not been committed to source control, or NuGet Package Restore is not enabled. Please enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
<Error Condition="Exists('..\..\packages\ExcelDna.AddIn.0.34.1-beta\tools\ExcelDna.AddIn.targets') And ('$(RunExcelDnaBuild)' != '' And $(RunExcelDnaBuild))" Text="ExcelDna cannot be run because NuGet packages were restored prior to the build running, and the targets file was unavailable when the build started. Please build the project again to include these packages in the build. You may also need to make sure that your build server does not delete packages prior to each build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
<Error Condition="!Exists('..\..\packages\ExcelDna.AddIn.0.34.6\tools\ExcelDna.AddIn.targets') And ('$(RunExcelDnaBuild)' != '' And $(RunExcelDnaBuild))" Text="You are trying to build with ExcelDna, but the NuGet targets file that ExcelDna depends on is not available on this computer. This is probably because the ExcelDna package has not been committed to source control, or NuGet Package Restore is not enabled. Please enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
<Error Condition="Exists('..\..\packages\ExcelDna.AddIn.0.34.6\tools\ExcelDna.AddIn.targets') And ('$(RunExcelDnaBuild)' != '' And $(RunExcelDnaBuild))" Text="ExcelDna cannot be run because NuGet packages were restored prior to the build running, and the targets file was unavailable when the build started. Please build the project again to include these packages in the build. You may also need to make sure that your build server does not delete packages prior to each build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
</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="0.34.1-beta" targetFramework="net451" />
<package id="ExcelDna.Integration" version="0.34.1-beta" targetFramework="net451" />
<package id="ExcelDna.AddIn" version="0.34.6" targetFramework="net451" />
<package id="ExcelDna.Integration" version="0.34.6" 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 @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Registration.Sample")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyCopyright("Copyright © 2015-2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="ExcelDnaProps">
<!--
If you change properties in this file, they may not come into effect until you:
Expand Down
Loading

0 comments on commit bdf9f68

Please sign in to comment.