Skip to content

Commit d2367f9

Browse files
govertgovert
authored
Merge pull request #30 from augustoproiete/update-projects-to-target-exceldna-v1.1.0-beta2
Update all projects to target ExcelDna v1.1.0-beta2
2 parents 6e94d1f + 847ee67 commit d2367f9

File tree

17 files changed

+44
-44
lines changed

17 files changed

+44
-44
lines changed

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

Lines changed: 6 additions & 6 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>1.1.0-beta1</version>
5+
<version>1.1.0-beta2</version>
66
<title>Excel-DNA Registration Extensions for F#</title>
77
<authors>Govert van Drimmelen</authors>
88
<owners>Govert van Drimmelen</owners>
@@ -14,11 +14,11 @@
1414
This package adds additional transformations appropriate to F# projects.</description>
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>
17-
<dependencies>
18-
<dependency id="ExcelDna.Integration" version="[1.1.0-beta1]" />
19-
<dependency id="ExcelDna.Registration" version="[1.1.0-beta1]" />
20-
<dependency id="ExcelDna.Interop" version="14.0.0" />
21-
</dependencies>
17+
<dependencies>
18+
<dependency id="ExcelDna.Integration" version="1.1.0-beta2" />
19+
<dependency id="ExcelDna.Registration" version="1.1.0-beta2" />
20+
<dependency id="ExcelDna.Interop" version="14.0.0" />
21+
</dependencies>
2222
</metadata>
2323
<files>
2424
<file src="..\..\Source\ExcelDna.Registration.FSharp\bin\Release\ExcelDna.Registration.FSharp.dll" target="lib\net40\ExcelDna.Registration.FSharp.dll" />

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

Lines changed: 6 additions & 6 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>1.1.0-beta1</version>
5+
<version>1.1.0-beta2</version>
66
<title>Excel-DNA Registration Extensions for Visual Basic</title>
77
<authors>Govert van Drimmelen</authors>
88
<owners>Govert van Drimmelen</owners>
@@ -14,11 +14,11 @@
1414
This package adds additional transformations appropriate to Visual Basic projects, enhancing VBA compatibility.</description>
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>
17-
<dependencies>
18-
<dependency id="ExcelDna.Integration" version="[1.1.0-beta1]" />
19-
<dependency id="ExcelDna.Registration" version="[1.1.0-beta1]" />
20-
<dependency id="ExcelDna.Interop" version="14.0.0" />
21-
</dependencies>
17+
<dependencies>
18+
<dependency id="ExcelDna.Integration" version="1.1.0-beta2" />
19+
<dependency id="ExcelDna.Registration" version="1.1.0-beta2" />
20+
<dependency id="ExcelDna.Interop" version="14.0.0" />
21+
</dependencies>
2222
</metadata>
2323
<files>
2424
<file src="..\..\Source\ExcelDna.Registration.VisualBasic\bin\Release\ExcelDna.Registration.VisualBasic.dll" target="lib\net40\ExcelDna.Registration.VisualBasic.dll" />

‎NuGet/ExcelDna.Registration/ExcelDna.Registration.nuspec‎

Lines changed: 4 additions & 4 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>1.1.0-beta1</version>
5+
<version>1.1.0-beta2</version>
66
<title>Excel-DNA Registration Extensions</title>
77
<authors>Govert van Drimmelen</authors>
88
<owners>Govert van Drimmelen</owners>
@@ -13,9 +13,9 @@
1313
<description>Excel-DNA Registration is an enhancement for Excel-DNA.</description>
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>
16-
<dependencies>
17-
<dependency id="ExcelDna.Integration" version="[1.1.0-beta1]" />
18-
</dependencies>
16+
<dependencies>
17+
<dependency id="ExcelDna.Integration" version="1.1.0-beta2" />
18+
</dependencies>
1919
</metadata>
2020
<files>
2121
<file src="..\..\Source\ExcelDna.Registration\bin\Release\ExcelDna.Registration.dll" target="lib\net40\ExcelDna.Registration.dll" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
<Content Include="packages.config" />
7373
</ItemGroup>
7474
<ItemGroup>
75-
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
76-
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta1\lib\ExcelDna.Integration.dll</HintPath>
75+
<Reference Include="ExcelDna.Integration">
76+
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta2\lib\ExcelDna.Integration.dll</HintPath>
7777
<Private>True</Private>
7878
</Reference>
7979
<Reference Include="FSharp.Core">

‎Source/ExcelDna.Registration.FSharp/packages.config‎

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="net45" />
3+
<package id="ExcelDna.Integration" version="1.1.0-beta2" 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</PropertyGroup>
4848
<ItemGroup>
4949
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
50-
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta1\lib\ExcelDna.Integration.dll</HintPath>
50+
<HintPath>..\packages\ExcelDna.Integration.1.1.0-beta2\lib\ExcelDna.Integration.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
5353
<Reference Include="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">

‎Source/ExcelDna.Registration.VisualBasic/packages.config‎

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="net4" />
55
</packages>

‎Source/ExcelDna.Registration/ExcelDna.Registration.csproj‎

Lines changed: 1 addition & 1 deletion
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>True</Private>
3939
</Reference>
4040
<Reference Include="System" />

‎Source/ExcelDna.Registration/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
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
</packages>

‎Source/Samples/Registration.Sample.FSharp/Registration.Sample.FSharp.fsproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@
104104
<None Include="Properties\ExcelDna.Build.props" />
105105
</ItemGroup>
106106
<ItemGroup>
107-
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
108-
<HintPath>..\..\packages\ExcelDna.Integration.1.1.0-beta1\lib\ExcelDna.Integration.dll</HintPath>
109-
<Private>True</Private>
107+
<Reference Include="ExcelDna.Integration">
108+
<HintPath>..\..\packages\ExcelDna.Integration.1.1.0-beta2\lib\ExcelDna.Integration.dll</HintPath>
109+
<Private>False</Private>
110110
</Reference>
111111
<Reference Include="FSharp.Core">
112112
<HintPath>..\..\packages\FSharp.Core.4.6.2\lib\net45\FSharp.Core.dll</HintPath>
@@ -126,12 +126,12 @@
126126
<Private>True</Private>
127127
</ProjectReference>
128128
</ItemGroup>
129-
<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')" />
129+
<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')" />
130130
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
131131
<PropertyGroup>
132132
<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>
133133
</PropertyGroup>
134-
<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'))" />
134+
<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'))" />
135135
</Target>
136136
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
137137
Other similar extension points exist, see Microsoft.Common.targets.

0 commit comments

Comments
 (0)