Skip to content

Commit 73465f2

Browse files
author
sagi
committed
Logging: Update SDK-style project file
1 parent 411d0a9 commit 73465f2

File tree

5 files changed

+22
-174
lines changed

5 files changed

+22
-174
lines changed

Logging/Logging-AddIn.dna

-5
This file was deleted.

Logging/Logging.csproj

+16-79
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,17 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{8F73E277-5285-4835-9E7E-892ADB8DED48}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>Logging</RootNamespace>
11-
<AssemblyName>Logging</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25-
<DebugType>pdbonly</DebugType>
26-
<Optimize>true</Optimize>
27-
<OutputPath>bin\Release\</OutputPath>
28-
<DefineConstants>TRACE</DefineConstants>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
31-
</PropertyGroup>
32-
<ItemGroup>
33-
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
34-
<HintPath>packages\ExcelDna.Integration.1.1.0\lib\ExcelDna.Integration.dll</HintPath>
35-
</Reference>
36-
<Reference Include="log4net">
37-
<HintPath>packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
38-
</Reference>
39-
<Reference Include="NLog">
40-
<HintPath>packages\NLog.4.0.1\lib\net40\NLog.dll</HintPath>
41-
</Reference>
42-
<Reference Include="System" />
43-
<Reference Include="System.Core" />
44-
<Reference Include="System.Xml.Linq" />
45-
<Reference Include="System.Data.DataSetExtensions" />
46-
<Reference Include="Microsoft.CSharp" />
47-
<Reference Include="System.Data" />
48-
<Reference Include="System.Xml" />
49-
</ItemGroup>
50-
<ItemGroup>
51-
<Compile Include="Log4NetTraceListener.cs" />
52-
<Compile Include="RegistrationErrors.cs" />
53-
<Compile Include="RegistrationWarnings.cs" />
54-
<Compile Include="Properties\AssemblyInfo.cs" />
55-
<Compile Include="TestLoggers.cs" />
56-
</ItemGroup>
57-
<ItemGroup>
58-
<None Include="Properties\ExcelDna.Build.props" />
59-
<None Include="Logging-AddIn.dna" />
60-
<None Include="App.config">
61-
<SubType>Designer</SubType>
62-
</None>
63-
<None Include="packages.config" />
64-
</ItemGroup>
65-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
66-
<Import Project="packages\ExcelDna.AddIn.1.1.1\build\ExcelDna.AddIn.targets" Condition="Exists('packages\ExcelDna.AddIn.1.1.1\build\ExcelDna.AddIn.targets')" />
67-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
68-
<PropertyGroup>
69-
<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>
70-
</PropertyGroup>
71-
<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'))" />
72-
</Target>
73-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
74-
Other similar extension points exist, see Microsoft.Common.targets.
75-
<Target Name="BeforeBuild">
76-
</Target>
77-
<Target Name="AfterBuild">
78-
</Target>
79-
-->
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<PackageReference Include="ExcelDna.Addin" Version="*-*" />
9+
<PackageReference Include="log4net" Version="2.0.15" />
10+
<PackageReference Include="NLog" Version="5.2.4" />
11+
</ItemGroup>
12+
13+
<ItemGroup>
14+
<Folder Include="Properties\" />
15+
</ItemGroup>
16+
8017
</Project>

Logging/Properties/AssemblyInfo.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
// General Information about an assembly is controlled through the following
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
8-
[assembly: AssemblyTitle("Logging")]
8+
//[assembly: AssemblyTitle("Logging")]
99
[assembly: AssemblyDescription("")]
10-
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("Logging")]
10+
//[assembly: AssemblyConfiguration("")]
11+
//[assembly: AssemblyCompany("")]
12+
//[assembly: AssemblyProduct("Logging")]
1313
[assembly: AssemblyCopyright("Copyright © 2015")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
35+
//[assembly: AssemblyVersion("1.0.0.0")]
36+
//[assembly: AssemblyFileVersion("1.0.0.0")]

Logging/Properties/ExcelDna.Build.props

-77
This file was deleted.

Logging/packages.config

-7
This file was deleted.

0 commit comments

Comments
 (0)