Skip to content

Commit 2bbc8be

Browse files
authored
Merge pull request #26 from caioproiete/target-exceldna-v1.0.0
Update projects and NuGet packages to target Excel-DNA v1.0.0
2 parents 1575b09 + 6128a39 commit 2bbc8be

File tree

23 files changed

+132
-57
lines changed

23 files changed

+132
-57
lines changed

NuGet/ExcelDna.Registration.FSharp/ExcelDna.Registration.FSharp.nuspec

Lines changed: 3 additions & 3 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.Registration.FSharp</id>
5-
<version>0.34.7</version>
5+
<version>1.0.0</version>
66
<title>Excel-DNA Registration Extensions for F#</title>
77
<authors>Govert van Drimmelen</authors>
88
<owners>Govert van Drimmelen</owners>
@@ -15,8 +15,8 @@
1515
<summary>Excel-DNA Registration provides custom registration and function transformation helpers to Excel-DNA add-ins.</summary>
1616
<tags>excel exceldna udf excel-dna</tags>
1717
<dependencies>
18-
<dependency id="ExcelDna.Integration" version="0.34.6" />
19-
<dependency id="ExcelDna.Registration" version="[0.34.7]" />
18+
<dependency id="ExcelDna.Integration" version="1.0.0" />
19+
<dependency id="ExcelDna.Registration" version="[1.0.0]" />
2020
<dependency id="ExcelDna.Interop" version="14.0.0" />
2121
</dependencies>
2222
</metadata>

NuGet/ExcelDna.Registration.VisualBasic/ExcelDna.Registration.VisualBasic.nuspec

Lines changed: 3 additions & 3 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.Registration.VisualBasic</id>
5-
<version>0.34.7</version>
5+
<version>1.0.0</version>
66
<title>Excel-DNA Registration Extensions for Visual Basic</title>
77
<authors>Govert van Drimmelen</authors>
88
<owners>Govert van Drimmelen</owners>
@@ -15,8 +15,8 @@
1515
<summary>Excel-DNA Registration provides custom registration and function transformation helpers to Excel-DNA add-ins.</summary>
1616
<tags>excel exceldna udf excel-dna</tags>
1717
<dependencies>
18-
<dependency id="ExcelDna.Integration" version="0.34.6" />
19-
<dependency id="ExcelDna.Registration" version="[0.34.7]" />
18+
<dependency id="ExcelDna.Integration" version="1.0.0" />
19+
<dependency id="ExcelDna.Registration" version="[1.0.0]" />
2020
<dependency id="ExcelDna.Interop" version="14.0.0" />
2121
</dependencies>
2222
</metadata>

NuGet/ExcelDna.Registration/ExcelDna.Registration.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.Registration</id>
5-
<version>0.34.7</version>
5+
<version>1.0.0</version>
66
<title>Excel-DNA Registration Extensions</title>
77
<authors>Govert van Drimmelen</authors>
88
<owners>Govert van Drimmelen</owners>
@@ -14,7 +14,7 @@
1414
<summary>Excel-DNA Registration provides custom registration and function transformation helpers to Excel-DNA add-ins.</summary>
1515
<tags>excel exceldna udf excel-dna</tags>
1616
<dependencies>
17-
<dependency id="ExcelDna.Integration" version="0.34.6" />
17+
<dependency id="ExcelDna.Integration" version="1.0.0" />
1818
</dependencies>
1919
</metadata>
2020
<files>

Source/ExcelDna.Registration.FSharp/AssemblyInfo.fs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
open System.Reflection
44

5-
[<assembly: AssemblyVersion("0.34.*")>]
6-
[<assembly: AssemblyFileVersion("0.34.7.1")>]
7-
do()
5+
[<assembly: AssemblyVersion("1.0.0.0")>]
6+
[<assembly: AssemblyFileVersion("1.0.0.0")>]
7+
[<assembly: AssemblyInformationalVersion("1.0.0")>]
8+
do()

Source/ExcelDna.Registration.FSharp/ExcelDna.Registration.FSharp.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@
7373
</ItemGroup>
7474
<ItemGroup>
7575
<Reference Include="ExcelDna.Integration">
76-
<HintPath>..\packages\ExcelDna.Integration.0.34.6\lib\ExcelDna.Integration.dll</HintPath>
77-
<Private>False</Private>
76+
<HintPath>..\packages\ExcelDna.Integration.1.0.0\lib\ExcelDna.Integration.dll</HintPath>
77+
<Private>True</Private>
7878
</Reference>
7979
<Reference Include="FSharp.Core">
8080
<HintPath>..\packages\FSharp.Core.4.6.2\lib\net45\FSharp.Core.dll</HintPath>
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="0.34.6" targetFramework="net40" />
3+
<package id="ExcelDna.Integration" version="1.0.0" targetFramework="net45" />
44
<package id="FSharp.Core" version="4.6.2" targetFramework="net45" />
55
</packages>

Source/ExcelDna.Registration.VisualBasic/ExcelDna.Registration.VisualBasic.vbproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
<OptionInfer>On</OptionInfer>
4545
</PropertyGroup>
4646
<ItemGroup>
47-
<Reference Include="ExcelDna.Integration, Version=0.34.6373.42344, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\ExcelDna.Integration.0.34.6\lib\ExcelDna.Integration.dll</HintPath>
49-
<Private>False</Private>
47+
<Reference Include="ExcelDna.Integration, Version=1.0.7056.37028, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\ExcelDna.Integration.1.0.0\lib\ExcelDna.Integration.dll</HintPath>
49+
<Private>True</Private>
5050
</Reference>
5151
<Reference Include="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
5252
<EmbedInteropTypes>True</EmbedInteropTypes>

Source/ExcelDna.Registration.VisualBasic/My Project/AssemblyInfo.vb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
1212
<Assembly: AssemblyDescription("")>
1313
<Assembly: AssemblyCompany("")>
1414
<Assembly: AssemblyProduct("ExcelDna.Registration.VisualBasic")>
15-
<Assembly: AssemblyCopyright("Copyright © 2015-2017")>
15+
<Assembly: AssemblyCopyright("Copyright © 2015-2019")>
1616
<Assembly: AssemblyTrademark("")>
1717

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

34-
<Assembly: AssemblyVersion("0.34.*")>
35-
<Assembly: AssemblyFileVersion("0.34.7.1")>
34+
<Assembly: AssemblyVersion("1.0.0.0")>
35+
<Assembly: AssemblyFileVersion("1.0.0.0")>
36+
<Assembly: AssemblyInformationalVersion("1.0.0")>
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="0.34.6" targetFramework="net40" />
3+
<package id="ExcelDna.Integration" version="1.0.0" targetFramework="net40" />
44
<package id="ExcelDna.Interop" version="14.0.1" targetFramework="net4" />
55
</packages>

Source/ExcelDna.Registration/ExcelDna.Registration.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34-
<Reference Include="ExcelDna.Integration, Version=0.34.6373.42344, Culture=neutral, processorArchitecture=MSIL">
35-
<HintPath>..\packages\ExcelDna.Integration.0.34.6\lib\ExcelDna.Integration.dll</HintPath>
36-
<Private>False</Private>
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>
36+
<Private>True</Private>
3737
</Reference>
3838
<Reference Include="System" />
3939
<Reference Include="System.Core" />

0 commit comments

Comments
 (0)