Merge pull request #420 from NetOfficeFw/dev/examples_restructure

NetOfficeFw · Jun 9, 2024 · c4d24c7 · c4d24c7
2 parents 8b62548 + 5d7e135
commit c4d24c7
Show file tree

Hide file tree

Showing 185 changed files with 394 additions and 1,086 deletions.
diff --git a/...cessExamples/AccessExamples CSharp.csproj → ...Access/Automation/AccessAutomation.csproj b/...cessExamples/AccessExamples CSharp.csproj → ...Access/Automation/AccessAutomation.csproj
@@ -24,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -33,6 +34,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -47,6 +49,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRuleSetDirectories>;C:\Programme\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
     <CodeAnalysisRuleDirectories>;C:\Programme\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <OutputPath>bin\Release\</OutputPath>
@@ -61,51 +64,14 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRuleSetDirectories>;C:\Programme\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
     <CodeAnalysisRuleDirectories>;C:\Programme\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AccessApi">
-      <HintPath>..\..\..\..\..\Assemblies\Any CPU\AccessApi.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ADODBApi">
-      <HintPath>..\..\..\..\..\Assemblies\Any CPU\ADODBApi.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="DAOApi">
-      <HintPath>..\..\..\..\..\Assemblies\Any CPU\DAOApi.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ExampleBase">
-      <HintPath>..\..\..\..\ExampleBase.dll</HintPath>
-    </Reference>
-    <Reference Include="MSComctlLibApi">
-      <HintPath>..\..\..\..\..\Assemblies\Any CPU\MSComctlLibApi.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="MSDATASRCApi">
-      <HintPath>..\..\..\..\..\Assemblies\Any CPU\MSDATASRCApi.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="NetOffice">
-      <HintPath>..\..\..\..\..\Assemblies\Any CPU\NetOffice.dll</HintPath>
-    </Reference>
-    <Reference Include="OfficeApi">
-      <HintPath>..\..\..\..\..\Assemblies\Any CPU\OfficeApi.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="OWC10Api">
-      <HintPath>..\..\..\..\..\Assemblies\Any CPU\OWC10Api.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="VBIDEApi">
-      <HintPath>..\..\..\..\..\Assemblies\Any CPU\VBIDEApi.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Examples\Example01.cs" />
@@ -147,6 +113,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <None Include="app.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -160,7 +127,28 @@
   <ItemGroup>
     <EmbeddedResource Include="Overview.txt" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Source\Access\AccessApi.csproj">
+      <Project>{e01e3993-d6ff-4cae-a8bd-e6c924988624}</Project>
+      <Name>AccessApi</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Source\DAO\DAOApi.csproj">
+      <Project>{e66d74ef-226c-46b9-b008-7af495a1da11}</Project>
+      <Name>DAOApi</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Source\NetOffice\NetOffice.csproj">
+      <Project>{c34ee361-0d28-471d-b44f-e1b4b286401f}</Project>
+      <Name>NetOffice</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Source\Office\OfficeApi.csproj">
+      <Project>{28ec9afb-801e-4acd-a922-109332f43434}</Project>
+      <Name>OfficeApi</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ExampleBase\ExampleBase.csproj">
+      <Project>{0d84e472-2f2b-490e-927a-0bdd751d6362}</Project>
+      <Name>ExampleBase</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/...ples/AccessExamples/Examples/Example01.cs → ...s/Access/Automation/Examples/Example01.cs b/...ples/AccessExamples/Examples/Example01.cs → ...s/Access/Automation/Examples/Example01.cs
diff --git a/...ples/AccessExamples/Examples/Example02.cs → ...s/Access/Automation/Examples/Example02.cs b/...ples/AccessExamples/Examples/Example02.cs → ...s/Access/Automation/Examples/Example02.cs
diff --git a/...ples/AccessExamples/Examples/Example03.cs → ...s/Access/Automation/Examples/Example03.cs b/...ples/AccessExamples/Examples/Example03.cs → ...s/Access/Automation/Examples/Example03.cs
diff --git a/...ssExamples/Examples/Example04.Designer.cs → ...Automation/Examples/Example04.Designer.cs b/...ssExamples/Examples/Example04.Designer.cs → ...Automation/Examples/Example04.Designer.cs
diff --git a/...ples/AccessExamples/Examples/Example04.cs → ...s/Access/Automation/Examples/Example04.cs b/...ples/AccessExamples/Examples/Example04.cs → ...s/Access/Automation/Examples/Example04.cs
diff --git a/...es/AccessExamples/Examples/Example04.resx → ...Access/Automation/Examples/Example04.resx b/...es/AccessExamples/Examples/Example04.resx → ...Access/Automation/Examples/Example04.resx
diff --git a/...ssExamples/Examples/Example05.Designer.cs → ...Automation/Examples/Example05.Designer.cs b/...ssExamples/Examples/Example05.Designer.cs → ...Automation/Examples/Example05.Designer.cs
diff --git a/...ples/AccessExamples/Examples/Example05.cs → ...s/Access/Automation/Examples/Example05.cs b/...ples/AccessExamples/Examples/Example05.cs → ...s/Access/Automation/Examples/Example05.cs
diff --git a/...es/AccessExamples/Examples/Example05.resx → ...Access/Automation/Examples/Example05.resx b/...es/AccessExamples/Examples/Example05.resx → ...Access/Automation/Examples/Example05.resx
diff --git a/...mples/AccessExamples/FormMain.Designer.cs → ...es/Access/Automation/FormMain.Designer.cs b/...mples/AccessExamples/FormMain.Designer.cs → ...es/Access/Automation/FormMain.Designer.cs
diff --git a/...ndard Examples/AccessExamples/FormMain.cs → Examples/Access/Automation/FormMain.cs b/...ndard Examples/AccessExamples/FormMain.cs → Examples/Access/Automation/FormMain.cs
diff --git a/...dard Examples/AccessExamples/Overview.txt → Examples/Access/Automation/Overview.txt b/...dard Examples/AccessExamples/Overview.txt → Examples/Access/Automation/Overview.txt
diff --git a/...andard Examples/AccessExamples/Program.cs → Examples/Access/Automation/Program.cs b/...andard Examples/AccessExamples/Program.cs → Examples/Access/Automation/Program.cs
diff --git a/...AccessExamples/Properties/AssemblyInfo.cs → ...ess/Automation/Properties/AssemblyInfo.cs b/...AccessExamples/Properties/AssemblyInfo.cs → ...ess/Automation/Properties/AssemblyInfo.cs
diff --git a/...Examples/Properties/Resources.Designer.cs → ...tomation/Properties/Resources.Designer.cs b/...Examples/Properties/Resources.Designer.cs → ...tomation/Properties/Resources.Designer.cs
diff --git a/.../AccessExamples/Properties/Resources.resx → ...cess/Automation/Properties/Resources.resx b/.../AccessExamples/Properties/Resources.resx → ...cess/Automation/Properties/Resources.resx
diff --git a/...olUpdater/Properties/Settings.Designer.cs → ...utomation/Properties/Settings.Designer.cs b/...olUpdater/Properties/Settings.Designer.cs → ...utomation/Properties/Settings.Designer.cs
diff --git a/...cessExamples/Properties/Settings.settings → ...s/Automation/Properties/Settings.settings b/...cessExamples/Properties/Settings.settings → ...s/Automation/Properties/Settings.settings
diff --git a/Examples/Access/Automation/app.config b/Examples/Access/Automation/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
diff --git a/Examples/Access/Standard Examples/AccessExamples.sln b/Examples/Access/Standard Examples/AccessExamples.sln
diff --git a/Examples/Access/Standard Examples/AccessExamples/Properties/Settings.Designer.cs b/Examples/Access/Standard Examples/AccessExamples/Properties/Settings.Designer.cs
diff --git a/Examples/AddinProject.exe b/Examples/AddinProject.exe
diff --git a/...inProjectHelper/AddinProjectHelper.csproj → ...inProjectHelper/AddinProjectHelper.csproj b/...inProjectHelper/AddinProjectHelper.csproj → ...inProjectHelper/AddinProjectHelper.csproj
diff --git a/Examples/AddinProjectHelper/AddinProjectHelper.sln b/Examples/AddinProjectHelper/AddinProjectHelper.sln
diff --git a/...lper/AddinProjectHelper/Form1.Designer.cs → ...ples/AddinProjectHelper/Form1.Designer.cs b/...lper/AddinProjectHelper/Form1.Designer.cs → ...ples/AddinProjectHelper/Form1.Designer.cs
diff --git a/...ProjectHelper/AddinProjectHelper/Form1.cs → Examples/AddinProjectHelper/Form1.cs b/...ProjectHelper/AddinProjectHelper/Form1.cs → Examples/AddinProjectHelper/Form1.cs
diff --git a/...ojectHelper/AddinProjectHelper/Form1.resx → Examples/AddinProjectHelper/Form1.resx b/...ojectHelper/AddinProjectHelper/Form1.resx → Examples/AddinProjectHelper/Form1.resx
diff --git a/...jectHelper/AddinProjectHelper/Injector.cs → Examples/AddinProjectHelper/Injector.cs b/...jectHelper/AddinProjectHelper/Injector.cs → Examples/AddinProjectHelper/Injector.cs
diff --git a/...dinProjectHelper/NetOffice.Icon.32x32.ico → ...dinProjectHelper/NetOffice.Icon.32x32.ico b/...dinProjectHelper/NetOffice.Icon.32x32.ico → ...dinProjectHelper/NetOffice.Icon.32x32.ico
diff --git a/...ojectHelper/AddinProjectHelper/Program.cs → Examples/AddinProjectHelper/Program.cs b/...ojectHelper/AddinProjectHelper/Program.cs → Examples/AddinProjectHelper/Program.cs
diff --git a/...nProjectHelper/Properties/AssemblyInfo.cs → ...nProjectHelper/Properties/AssemblyInfo.cs b/...nProjectHelper/Properties/AssemblyInfo.cs → ...nProjectHelper/Properties/AssemblyInfo.cs
diff --git a/...ctHelper/Properties/Resources.Designer.cs → ...ctHelper/Properties/Resources.Designer.cs b/...ctHelper/Properties/Resources.Designer.cs → ...ctHelper/Properties/Resources.Designer.cs
diff --git a/...inProjectHelper/Properties/Resources.resx → ...inProjectHelper/Properties/Resources.resx b/...inProjectHelper/Properties/Resources.resx → ...inProjectHelper/Properties/Resources.resx
diff --git a/...ectHelper/Properties/Settings.Designer.cs → ...ectHelper/Properties/Settings.Designer.cs b/...ectHelper/Properties/Settings.Designer.cs → ...ectHelper/Properties/Settings.Designer.cs
diff --git a/...rojectHelper/Properties/Settings.settings → ...rojectHelper/Properties/Settings.settings b/...rojectHelper/Properties/Settings.settings → ...rojectHelper/Properties/Settings.settings
diff --git a/...ectHelper/AddinProjectHelper/Template.txt → Examples/AddinProjectHelper/Template.txt b/...ectHelper/AddinProjectHelper/Template.txt → Examples/AddinProjectHelper/Template.txt
diff --git a/Examples/AddinRemoval.exe b/Examples/AddinRemoval.exe
diff --git a/...emovalTool/AddinRemovalTool/AddinEntry.cs → Examples/AddinRemovalTool/AddinEntry.cs b/...emovalTool/AddinRemovalTool/AddinEntry.cs → Examples/AddinRemovalTool/AddinEntry.cs
diff --git a/.../AddinRemovalTool/AddinRemovalTool.csproj → .../AddinRemovalTool/AddinRemovalTool.csproj b/.../AddinRemovalTool/AddinRemovalTool.csproj → .../AddinRemovalTool/AddinRemovalTool.csproj
@@ -5,13 +5,14 @@
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9BF0A9F0-F7BC-4A98-BEA4-44F29A92C9A2}</ProjectGuid>
+    <ProjectGuid>{FFE28948-F038-49FC-B407-19AD9C549EDF}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AddinRemovalTool</RootNamespace>
     <AssemblyName>AddinRemovalTool</AssemblyName>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-    <TargetFrameworkProfile></TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

diff --git a/Examples/AddinRemovalTool/AddinRemovalTool.sln b/Examples/AddinRemovalTool/AddinRemovalTool.sln