Skip to content

Commit cd311c8

Browse files
Update ExcelDna to v1.5.0
1 parent 331bd07 commit cd311c8

File tree

4 files changed

+16
-9
lines changed

4 files changed

+16
-9
lines changed

sample/SampleAddIn/Properties/ExcelDna.Build.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@
5252
<ExcelDna64BitAddInSuffix Condition="'$(ExcelDna64BitAddInSuffix)' == ''">64</ExcelDna64BitAddInSuffix>
5353
</PropertyGroup>
5454

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+
5562
<!--
5663
Configuration properties for packing .dna files
5764
-->

sample/SampleAddIn/SampleAddIn.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +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\lib\ExcelDna.Integration.dll</HintPath>
40+
<HintPath>..\..\packages\ExcelDna.Integration.1.5.0\lib\net452\ExcelDna.Integration.dll</HintPath>
4141
</Reference>
4242
<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>
43+
<HintPath>..\..\packages\ExcelDna.Registration.1.5.0\lib\net452\ExcelDna.Registration.dll</HintPath>
4444
</Reference>
4545
<Reference Include="Microsoft.CSharp" />
4646
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
@@ -86,11 +86,11 @@
8686
</Content>
8787
</ItemGroup>
8888
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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')" />
89+
<Import Project="..\..\packages\ExcelDna.AddIn.1.5.0\build\ExcelDna.AddIn.targets" Condition="Exists('..\..\packages\ExcelDna.AddIn.1.5.0\build\ExcelDna.AddIn.targets')" />
9090
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
9191
<PropertyGroup>
9292
<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>
9393
</PropertyGroup>
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'))" />
94+
<Error Condition="!Exists('..\..\packages\ExcelDna.AddIn.1.5.0\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\ExcelDna.AddIn.1.5.0\build\ExcelDna.AddIn.targets'))" />
9595
</Target>
9696
</Project>

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" 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" />
3+
<package id="ExcelDna.AddIn" version="1.5.0" targetFramework="net48" developmentDependency="true" />
4+
<package id="ExcelDna.Integration" version="1.5.0" targetFramework="net48" />
5+
<package id="ExcelDna.Registration" version="1.5.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;net461;net472;net48</TargetFrameworks>
4+
<TargetFrameworks>net452;net461;net472;net48</TargetFrameworks>
55
<RootNamespace>Serilog</RootNamespace>
66

77
<AssemblyName>Serilog.Sinks.ExcelDnaLogDisplay</AssemblyName>
@@ -62,7 +62,7 @@
6262

6363
<ItemGroup>
6464
<PackageReference Include="Serilog" Version="2.5.0" />
65-
<PackageReference Include="ExcelDna.Integration" Version="1.1.0" />
65+
<PackageReference Include="ExcelDna.Integration" Version="1.5.0" />
6666
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
6767
</ItemGroup>
6868

0 commit comments

Comments
 (0)