Skip to content

Commit c57b1ea

Browse files
Update Serilog.Enrichers.ExcelDna to target ExcelDna v1.0.0
1 parent cffe609 commit c57b1ea

File tree

5 files changed

+16
-12
lines changed

5 files changed

+16
-12
lines changed

sample/SampleAddIn/SampleAddIn.csproj

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<Deterministic>true</Deterministic>
15+
<NuGetPackageImportStamp>
16+
</NuGetPackageImportStamp>
1517
</PropertyGroup>
1618
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1719
<DebugSymbols>true</DebugSymbols>
@@ -34,8 +36,8 @@
3436
</DocumentationFile>
3537
</PropertyGroup>
3638
<ItemGroup>
37-
<Reference Include="ExcelDna.Integration, Version=0.34.6373.42344, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\..\packages\ExcelDna.Integration.0.34.6\lib\ExcelDna.Integration.dll</HintPath>
39+
<Reference Include="ExcelDna.Integration, Version=1.0.7056.37028, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\..\packages\ExcelDna.Integration.1.0.0\lib\ExcelDna.Integration.dll</HintPath>
3941
<Private>False</Private>
4042
</Reference>
4143
<Reference Include="Microsoft.CSharp" />
@@ -68,9 +70,11 @@
6870
</ProjectReference>
6971
</ItemGroup>
7072
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
71-
<Import Project="..\..\packages\ExcelDna.AddIn.0.34.6\tools\ExcelDna.AddIn.targets" Condition="Exists('..\..\packages\ExcelDna.AddIn.0.34.6\tools\ExcelDna.AddIn.targets')" />
72-
<Target Name="EnsureExcelDnaTargetsImported" BeforeTargets="BeforeBuild" Condition="'$(ExcelDnaTargetsImported)' == ''">
73-
<Error Condition="!Exists('..\..\packages\ExcelDna.AddIn.0.34.6\tools\ExcelDna.AddIn.targets') And ('$(RunExcelDnaBuild)' != '' And $(RunExcelDnaBuild))" Text="You are trying to build with ExcelDna, but the NuGet targets file that ExcelDna depends on is not available on this computer. This is probably because the ExcelDna package has not been committed to source control, or NuGet Package Restore is not enabled. Please enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
74-
<Error Condition="Exists('..\..\packages\ExcelDna.AddIn.0.34.6\tools\ExcelDna.AddIn.targets') And ('$(RunExcelDnaBuild)' != '' And $(RunExcelDnaBuild))" Text="ExcelDna cannot be run because NuGet packages were restored prior to the build running, and the targets file was unavailable when the build started. Please build the project again to include these packages in the build. You may also need to make sure that your build server does not delete packages prior to each build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
73+
<Import Project="..\..\packages\ExcelDna.AddIn.1.0.0\build\ExcelDna.AddIn.targets" Condition="Exists('..\..\packages\ExcelDna.AddIn.1.0.0\build\ExcelDna.AddIn.targets')" />
74+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
75+
<PropertyGroup>
76+
<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>
77+
</PropertyGroup>
78+
<Error Condition="!Exists('..\..\packages\ExcelDna.AddIn.1.0.0\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\ExcelDna.AddIn.1.0.0\build\ExcelDna.AddIn.targets'))" />
7579
</Target>
7680
</Project>

sample/SampleAddIn/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ExcelDna.AddIn" version="0.34.6" targetFramework="net45" />
4-
<package id="ExcelDna.Integration" version="0.34.6" targetFramework="net45" />
3+
<package id="ExcelDna.AddIn" version="1.0.0" targetFramework="net45" />
4+
<package id="ExcelDna.Integration" version="1.0.0" targetFramework="net45" />
55
<package id="Serilog" version="2.7.1" targetFramework="net45" />
66
<package id="Serilog.Sinks.ExcelDnaLogDisplay" version="1.0.0" targetFramework="net45" />
77
</packages>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<DocumentationFile>bin\Release\Serilog.Enrichers.ExcelDna.xml</DocumentationFile>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="ExcelDna.Integration, Version=0.34.6373.42344, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\..\packages\ExcelDna.Integration.0.34.6\lib\ExcelDna.Integration.dll</HintPath>
38+
<Reference Include="ExcelDna.Integration, Version=1.0.7056.37028, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\..\packages\ExcelDna.Integration.1.0.0\lib\ExcelDna.Integration.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
4242
<Reference Include="Microsoft.CSharp" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<dependencies>
1919
<group targetFramework=".NETFramework4.5">
2020
<dependency id="Serilog" version="2.5.0" exclude="Build,Analyzers" />
21-
<dependency id="ExcelDna.Integration" version="0.34.6" exclude="Build,Analyzers" />
21+
<dependency id="ExcelDna.Integration" version="1.0.0" exclude="Build,Analyzers" />
2222
</group>
2323
</dependencies>
2424
<frameworkAssemblies>
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="net45" />
3+
<package id="ExcelDna.Integration" version="1.0.0" targetFramework="net45" />
44
<package id="Serilog" version="2.7.1" targetFramework="net45" />
55
</packages>

0 commit comments

Comments
 (0)