Skip to content

Commit 05e48ab

Browse files
augustoproieteaugustoproiete
committed
Update projects to target Excel-DNA v1.1
1 parent b4f1517 commit 05e48ab

File tree

6 files changed

+42
-15
lines changed

6 files changed

+42
-15
lines changed

‎sample/SampleAddIn/Properties/ExcelDna.Build.props

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,28 @@
1313
* Open your solution/project again in Visual Studio
1414
-->
1515

16+
<!--
17+
Configuration properties for debugging Excel-DNA add-ins
18+
-->
19+
<PropertyGroup>
20+
<!--
21+
Enable/Disable setting the debug options when building the project
22+
-->
23+
<RunExcelDnaSetDebuggerOptions Condition="'$(RunExcelDnaSetDebuggerOptions)' == ''">true</RunExcelDnaSetDebuggerOptions>
24+
25+
<!--
26+
Override the path of EXCEL.EXE used for debugging the project, if you need
27+
By default, it will use the latest version of Excel it can find on the machine
28+
-->
29+
<ExcelDnaExcelExePath Condition="'$(ExcelDnaExcelExePath)' == ''"></ExcelDnaExcelExePath>
30+
31+
<!--
32+
Override the name of the .XLL add-in to use when debugging the project, if you need
33+
By default, it will use the first unpacked .xll add-in that matches the bitness of EXCEL.EXE
34+
-->
35+
<ExcelDnaAddInForDebugging Condition="'$(ExcelDnaAddInForDebugging)' == ''"></ExcelDnaAddInForDebugging>
36+
</PropertyGroup>
37+
1638
<!--
1739
Configuration properties for building .dna files
1840
-->
@@ -30,6 +52,13 @@
3052
<ExcelDna64BitAddInSuffix Condition="'$(ExcelDna64BitAddInSuffix)' == ''">64</ExcelDna64BitAddInSuffix>
3153
</PropertyGroup>
3254

55+
<PropertyGroup>
56+
<!--
57+
Enable/Disable using Excel-DNA with PackageReference projects (not officially supported)
58+
-->
59+
<ExcelDnaAllowPackageReferenceProjectStyle Condition="'$(ExcelDnaAllowPackageReferenceProjectStyle)' == ''">false</ExcelDnaAllowPackageReferenceProjectStyle>
60+
</PropertyGroup>
61+
3362
<!--
3463
Configuration properties for packing .dna files
3564
-->

‎sample/SampleAddIn/SampleAddIn.csproj

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,14 @@
3838
</PropertyGroup>
3939
<ItemGroup>
4040
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
41-
<HintPath>..\..\packages\ExcelDna.Integration.1.1.0-beta1\lib\ExcelDna.Integration.dll</HintPath>
42-
<Private>False</Private>
41+
<HintPath>..\..\packages\ExcelDna.Integration.1.1.0\lib\ExcelDna.Integration.dll</HintPath>
4342
</Reference>
4443
<Reference Include="Microsoft.CSharp" />
4544
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
4645
<HintPath>..\..\packages\Serilog.2.9.0\lib\net45\Serilog.dll</HintPath>
4746
</Reference>
4847
<Reference Include="Serilog.Sinks.ExcelDnaLogDisplay, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
49-
<HintPath>..\..\packages\Serilog.Sinks.ExcelDnaLogDisplay.1.1.1-beta1\lib\net45\Serilog.Sinks.ExcelDnaLogDisplay.dll</HintPath>
48+
<HintPath>..\..\packages\Serilog.Sinks.ExcelDnaLogDisplay.1.1.1\lib\net45\Serilog.Sinks.ExcelDnaLogDisplay.dll</HintPath>
5049
</Reference>
5150
<Reference Include="System" />
5251
<Reference Include="System.Core" />
@@ -59,12 +58,12 @@
5958
<None Include="App.config">
6059
<SubType>Designer</SubType>
6160
</None>
61+
<None Include="Properties\ExcelDna.Build.props" />
6262
<None Include="ExcelDna.DnaLibrary.xsd">
6363
<SubType>Designer</SubType>
6464
</None>
6565
<None Include="packages.config" />
6666
<None Include="SampleAddIn.dna" />
67-
<None Include="Properties\ExcelDna.Build.props" />
6867
</ItemGroup>
6968
<ItemGroup>
7069
<ProjectReference Include="..\..\src\Serilog.Enrichers.ExcelDna\Serilog.Enrichers.ExcelDna.csproj">
@@ -73,11 +72,11 @@
7372
</ProjectReference>
7473
</ItemGroup>
7574
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
76-
<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')" />
75+
<Import Project="..\..\packages\ExcelDna.AddIn.1.1.1\build\ExcelDna.AddIn.targets" Condition="Exists('..\..\packages\ExcelDna.AddIn.1.1.1\build\ExcelDna.AddIn.targets')" />
7776
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
7877
<PropertyGroup>
7978
<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>
8079
</PropertyGroup>
81-
<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'))" />
80+
<Error Condition="!Exists('..\..\packages\ExcelDna.AddIn.1.1.1\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\ExcelDna.AddIn.1.1.1\build\ExcelDna.AddIn.targets'))" />
8281
</Target>
8382
</Project>

‎sample/SampleAddIn/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ExcelDna.AddIn" version="1.1.0-beta1" targetFramework="net48" developmentDependency="true" />
4-
<package id="ExcelDna.Integration" version="1.1.0-beta1" targetFramework="net48" />
3+
<package id="ExcelDna.AddIn" version="1.1.1" targetFramework="net48" developmentDependency="true" />
4+
<package id="ExcelDna.Integration" version="1.1.0" targetFramework="net48" />
55
<package id="ExcelDna.XmlSchemas" version="1.0.0" targetFramework="net48" />
66
<package id="Serilog" version="2.9.0" targetFramework="net48" requireReinstallation="true" />
7-
<package id="Serilog.Sinks.ExcelDnaLogDisplay" version="1.1.1-beta1" targetFramework="net48" />
8-
</packages>
7+
<package id="Serilog.Sinks.ExcelDnaLogDisplay" version="1.1.1" targetFramework="net48" />
8+
</packages>

‎src/Serilog.Enrichers.ExcelDna/Serilog.Enrichers.ExcelDna.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
</PropertyGroup>
3939
<ItemGroup>
4040
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
41-
<HintPath>..\..\packages\ExcelDna.Integration.1.1.0-beta1\lib\ExcelDna.Integration.dll</HintPath>
42-
<Private>True</Private>
41+
<HintPath>..\..\packages\ExcelDna.Integration.1.1.0\lib\ExcelDna.Integration.dll</HintPath>
4342
</Reference>
4443
<Reference Include="Microsoft.CSharp" />
4544
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
@@ -63,4 +62,4 @@
6362
</None>
6463
</ItemGroup>
6564
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
66-
</Project>
65+
</Project>

‎src/Serilog.Enrichers.ExcelDna/Serilog.Enrichers.ExcelDna.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<dependencies>
2020
<group targetFramework=".NETFramework4.5">
2121
<dependency id="Serilog" version="2.5.0" exclude="Build,Analyzers" />
22-
<dependency id="ExcelDna.Integration" version="1.1.0-beta" exclude="Build,Analyzers" />
22+
<dependency id="ExcelDna.Integration" version="1.1.0" exclude="Build,Analyzers" />
2323
</group>
2424
</dependencies>
2525
<frameworkAssemblies>

‎src/Serilog.Enrichers.ExcelDna/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" targetFramework="net45" />
44
<package id="Serilog" version="2.9.0" targetFramework="net45" />
55
</packages>

0 commit comments

Comments
 (0)