Skip to content

Commit 6740e08

Browse files
author
sagi
committed
UsingDAO: Update to SDK-style project file
1 parent f217ffc commit 6740e08

File tree

5 files changed

+24
-251
lines changed

5 files changed

+24
-251
lines changed

‎UsingDAO/My Project/AssemblyInfo.vb

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ Imports System.Runtime.InteropServices
88

99
' Review the values of the assembly attributes
1010

11-
<Assembly: AssemblyTitle("UsingDAO")>
12-
<Assembly: AssemblyDescription("")>
13-
<Assembly: AssemblyCompany("")>
14-
<Assembly: AssemblyProduct("UsingDAO")>
11+
'<Assembly: AssemblyTitle("UsingDAO")>
12+
<Assembly: AssemblyDescription("")>
13+
'<Assembly: AssemblyCompany("")>
14+
'<Assembly: AssemblyProduct("UsingDAO")>
1515
<Assembly: AssemblyCopyright("Copyright © 2015")>
1616
<Assembly: AssemblyTrademark("")>
1717

1818
<Assembly: ComVisible(False)>
1919

2020
'The following GUID is for the ID of the typelib if this project is exposed to COM
21-
<Assembly: Guid("9837e37e-15fa-420d-a4e5-b9e371669055")>
21+
<Assembly: Guid("9837e37e-15fa-420d-a4e5-b9e371669055")>
2222

2323
' Version information for an assembly consists of the following four values:
2424
'
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' by using the '*' as shown below:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("1.0.0.0")>
35-
<Assembly: AssemblyFileVersion("1.0.0.0")>
34+
'<Assembly: AssemblyVersion("1.0.0.0")>
35+
'<Assembly: AssemblyFileVersion("1.0.0.0")>

‎UsingDAO/Properties/ExcelDna.Build.props

-77
This file was deleted.

‎UsingDAO/UsingDAO-AddIn.dna

-20
This file was deleted.

‎UsingDAO/UsingDAO.vbproj

+17-140
Original file line numberDiff line numberDiff line change
@@ -1,141 +1,18 @@
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>{D6F8D252-D6CF-4578-BF1B-78F6A1FC9ABF}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<RootNamespace>UsingDAO</RootNamespace>
10-
<AssemblyName>UsingDAO</AssemblyName>
11-
<FileAlignment>512</FileAlignment>
12-
<MyType>Windows</MyType>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<DefineDebug>true</DefineDebug>
19-
<DefineTrace>true</DefineTrace>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DocumentationFile>UsingDAO.xml</DocumentationFile>
22-
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
23-
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25-
<DebugType>pdbonly</DebugType>
26-
<DefineDebug>false</DefineDebug>
27-
<DefineTrace>true</DefineTrace>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DocumentationFile>UsingDAO.xml</DocumentationFile>
31-
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
32-
</PropertyGroup>
33-
<PropertyGroup>
34-
<OptionExplicit>On</OptionExplicit>
35-
</PropertyGroup>
36-
<PropertyGroup>
37-
<OptionCompare>Binary</OptionCompare>
38-
</PropertyGroup>
39-
<PropertyGroup>
40-
<OptionStrict>Off</OptionStrict>
41-
</PropertyGroup>
42-
<PropertyGroup>
43-
<OptionInfer>On</OptionInfer>
44-
</PropertyGroup>
45-
<ItemGroup>
46-
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
47-
<HintPath>packages\ExcelDna.Integration.1.1.0\lib\ExcelDna.Integration.dll</HintPath>
48-
</Reference>
49-
<Reference Include="Microsoft.Office.interop.access.dao, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
50-
<EmbedInteropTypes>True</EmbedInteropTypes>
51-
<Private>True</Private>
52-
<HintPath>packages\ExcelDna.Interop.Dao.14.0.2\lib\Microsoft.Office.interop.access.dao.dll</HintPath>
53-
</Reference>
54-
<Reference Include="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
55-
<EmbedInteropTypes>True</EmbedInteropTypes>
56-
<Private>True</Private>
57-
<HintPath>packages\ExcelDna.Interop.14.0.1\lib\Microsoft.Office.Interop.Excel.dll</HintPath>
58-
</Reference>
59-
<Reference Include="Microsoft.Vbe.Interop, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
60-
<EmbedInteropTypes>True</EmbedInteropTypes>
61-
<Private>True</Private>
62-
<HintPath>packages\ExcelDna.Interop.14.0.1\lib\Microsoft.Vbe.Interop.dll</HintPath>
63-
</Reference>
64-
<Reference Include="Office, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
65-
<EmbedInteropTypes>True</EmbedInteropTypes>
66-
<Private>True</Private>
67-
<HintPath>packages\ExcelDna.Interop.14.0.1\lib\Office.dll</HintPath>
68-
</Reference>
69-
<Reference Include="System" />
70-
<Reference Include="System.Data" />
71-
<Reference Include="System.Xml" />
72-
<Reference Include="System.Core" />
73-
<Reference Include="System.Xml.Linq" />
74-
<Reference Include="System.Data.DataSetExtensions" />
75-
</ItemGroup>
76-
<ItemGroup>
77-
<Import Include="Microsoft.VisualBasic" />
78-
<Import Include="System" />
79-
<Import Include="System.Collections" />
80-
<Import Include="System.Collections.Generic" />
81-
<Import Include="System.Data" />
82-
<Import Include="System.Diagnostics" />
83-
<Import Include="System.Linq" />
84-
<Import Include="System.Xml.Linq" />
85-
</ItemGroup>
86-
<ItemGroup>
87-
<Compile Include="MyAddIn.vb" />
88-
<Compile Include="My Project\AssemblyInfo.vb" />
89-
<Compile Include="My Project\Application.Designer.vb">
90-
<AutoGen>True</AutoGen>
91-
<DependentUpon>Application.myapp</DependentUpon>
92-
</Compile>
93-
<Compile Include="My Project\Resources.Designer.vb">
94-
<AutoGen>True</AutoGen>
95-
<DesignTime>True</DesignTime>
96-
<DependentUpon>Resources.resx</DependentUpon>
97-
</Compile>
98-
<Compile Include="My Project\Settings.Designer.vb">
99-
<AutoGen>True</AutoGen>
100-
<DependentUpon>Settings.settings</DependentUpon>
101-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
102-
</Compile>
103-
</ItemGroup>
104-
<ItemGroup>
105-
<EmbeddedResource Include="My Project\Resources.resx">
106-
<Generator>VbMyResourcesResXFileCodeGenerator</Generator>
107-
<LastGenOutput>Resources.Designer.vb</LastGenOutput>
108-
<CustomToolNamespace>My.Resources</CustomToolNamespace>
109-
<SubType>Designer</SubType>
110-
</EmbeddedResource>
111-
</ItemGroup>
112-
<ItemGroup>
113-
<None Include="packages.config" />
114-
<None Include="Properties\ExcelDna.Build.props" />
115-
<None Include="UsingDAO-AddIn.dna" />
116-
<None Include="My Project\Application.myapp">
117-
<Generator>MyApplicationCodeGenerator</Generator>
118-
<LastGenOutput>Application.Designer.vb</LastGenOutput>
119-
</None>
120-
<None Include="My Project\Settings.settings">
121-
<Generator>SettingsSingleFileGenerator</Generator>
122-
<CustomToolNamespace>My</CustomToolNamespace>
123-
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
124-
</None>
125-
</ItemGroup>
126-
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
127-
<Import Project="packages\ExcelDna.AddIn.1.1.1\build\ExcelDna.AddIn.targets" Condition="Exists('packages\ExcelDna.AddIn.1.1.1\build\ExcelDna.AddIn.targets')" />
128-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
129-
<PropertyGroup>
130-
<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>
131-
</PropertyGroup>
132-
<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'))" />
133-
</Target>
134-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
135-
Other similar extension points exist, see Microsoft.Common.targets.
136-
<Target Name="BeforeBuild">
137-
</Target>
138-
<Target Name="AfterBuild">
139-
</Target>
140-
-->
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="ExcelDna.Interop" Version="*-*" />
10+
<PackageReference Include="ExcelDna.Interop.DAO" Version="*-*" />
11+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<Folder Include="Properties\" />
16+
</ItemGroup>
17+
14118
</Project>

‎UsingDAO/packages.config

-7
This file was deleted.

0 commit comments

Comments
 (0)