Skip to content

Commit 9d32d79

Browse files
augustoproieteaugustoproiete
committed
Update projects to target Excel-DNA v1.1.0
1 parent 8a71427 commit 9d32d79

File tree

10 files changed

+39
-20
lines changed

10 files changed

+39
-20
lines changed

‎sample/SampleAddIn/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
55
</startup>
66
</configuration>

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

Lines changed: 23 additions & 1 deletion
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
-->
@@ -26,7 +48,7 @@
2648
<!--
2749
Define the suffix used for each platform-specific file e.g. MyAddIn64.dna
2850
-->
29-
<ExcelDna32BitAddInSuffix Condition="'$(ExcelDna32BitAddInSuffix)' == ''">32</ExcelDna32BitAddInSuffix>
51+
<ExcelDna32BitAddInSuffix Condition="'$(ExcelDna32BitAddInSuffix)' == ''"></ExcelDna32BitAddInSuffix>
3052
<ExcelDna64BitAddInSuffix Condition="'$(ExcelDna64BitAddInSuffix)' == ''">64</ExcelDna64BitAddInSuffix>
3153
</PropertyGroup>
3254

‎sample/SampleAddIn/SampleAddIn.csproj‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@
3737
</PropertyGroup>
3838
<ItemGroup>
3939
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
40-
<HintPath>..\..\packages\ExcelDna.Integration.1.1.0-beta1\lib\ExcelDna.Integration.dll</HintPath>
41-
<Private>False</Private>
40+
<HintPath>..\..\packages\ExcelDna.Integration.1.1.0\lib\ExcelDna.Integration.dll</HintPath>
4241
</Reference>
43-
<Reference Include="ExcelDna.Registration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
44-
<HintPath>..\..\packages\ExcelDna.Registration.1.1.0-beta1\lib\net40\ExcelDna.Registration.dll</HintPath>
42+
<Reference Include="ExcelDna.Registration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
43+
<HintPath>..\..\packages\ExcelDna.Registration.1.1.0\lib\net40\ExcelDna.Registration.dll</HintPath>
4544
</Reference>
4645
<Reference Include="Microsoft.CSharp" />
4746
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
@@ -87,11 +86,11 @@
8786
</Content>
8887
</ItemGroup>
8988
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
90-
<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')" />
89+
<Import Project="..\..\packages\ExcelDna.AddIn.1.1.0\build\ExcelDna.AddIn.targets" Condition="Exists('..\..\packages\ExcelDna.AddIn.1.1.0\build\ExcelDna.AddIn.targets')" />
9190
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
9291
<PropertyGroup>
9392
<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>
9493
</PropertyGroup>
95-
<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'))" />
94+
<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'))" />
9695
</Target>
9796
</Project>

‎sample/SampleAddIn/SampleAddIn.dna‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<DnaLibrary Name="Serilog Sink LogDisplay Sample Add-In" RuntimeVersion="v4.0" xmlns="http://schemas.excel-dna.net/addin/2018/05/dnalibrary">
2-
<ExternalLibrary Path="SampleAddIn.dll" ExplicitExports="true" ExplicitRegistration="true" LoadFromBytes="false" Pack="false" />
2+
<ExternalLibrary Path="SampleAddIn.dll" ExplicitExports="true" ExplicitRegistration="true" LoadFromBytes="false" Pack="false" IncludePdb="false" />
33
</DnaLibrary>

‎sample/SampleAddIn/packages.config‎

Lines changed: 3 additions & 3 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" />
5-
<package id="ExcelDna.Registration" version="1.1.0-beta1" targetFramework="net48" />
3+
<package id="ExcelDna.AddIn" version="1.1.0" targetFramework="net48" developmentDependency="true" />
4+
<package id="ExcelDna.Integration" version="1.1.0" targetFramework="net48" />
5+
<package id="ExcelDna.Registration" version="1.1.0" targetFramework="net48" />
66
<package id="ExcelDna.XmlSchemas" version="1.0.0" targetFramework="net48" />
77
<package id="Serilog" version="2.9.0" targetFramework="net48" />
88
</packages>

‎src/Serilog.Sinks.ExcelDnaLogDisplay/Serilog.Sinks.ExcelDnaLogDisplay.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
</PropertyGroup>
3838
<ItemGroup>
3939
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
40-
<HintPath>..\..\packages\ExcelDna.Integration.1.1.0-beta1\lib\ExcelDna.Integration.dll</HintPath>
41-
<Private>True</Private>
40+
<HintPath>..\..\packages\ExcelDna.Integration.1.1.0\lib\ExcelDna.Integration.dll</HintPath>
4241
</Reference>
4342
<Reference Include="Microsoft.CSharp" />
4443
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">

‎src/Serilog.Sinks.ExcelDnaLogDisplay/Serilog.Sinks.ExcelDnaLogDisplay.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-beta1" exclude="Build,Analyzers" />
22+
<dependency id="ExcelDna.Integration" version="1.1.0" exclude="Build,Analyzers" />
2323
</group>
2424
</dependencies>
2525
<frameworkAssemblies>

‎src/Serilog.Sinks.ExcelDnaLogDisplay/packages.config‎

Lines changed: 2 additions & 2 deletions
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" />
5-
</packages>
5+
</packages>

‎test/Serilog.Sinks.ExcelDnaLogDisplay.Tests/Serilog.Sinks.ExcelDnaLogDisplay.Tests.csproj‎

Lines changed: 1 addition & 2 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">

‎test/Serilog.Sinks.ExcelDnaLogDisplay.Tests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ExcelDna.Integration" version="1.1.0-beta1" targetFramework="net48" />
3+
<package id="ExcelDna.Integration" version="1.1.0" targetFramework="net48" />
44
<package id="Serilog" version="2.9.0" targetFramework="net48" />
55
<package id="xunit" version="2.4.0" targetFramework="net48" />
66
<package id="xunit.abstractions" version="2.0.2" targetFramework="net48" />

0 commit comments

Comments
 (0)