Skip to content

Commit 2b60011

Browse files
ITAgnesmeyerITAgnesmeyer
committed
All other Projects currently loads the Packages
1 parent d7ce4ca commit 2b60011

File tree

100 files changed

+92
-6963
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+92
-6963
lines changed

‎Src/ConsleCaller/ConsoleCaller.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
</PropertyGroup>
2929

3030
<ItemGroup>
31-
<ProjectReference Include="..\CoreWindowsWrapper\CoreWindowsWrapper.csproj" />
3231
<ProjectReference Include="..\Diga.NativeControls.WebBrowser.Core\Diga.NativeControls.WebBrowser.Core.csproj" />
3332
</ItemGroup>
3433

‎Src/CoreWindowsWrapper.FW/CoreWindowsWrapper.FW.csproj‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>Library</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>CoreWindowsWrapper</RootNamespace>
11-
<AssemblyName>CoreWindowsWrapper.FW</AssemblyName>
11+
<AssemblyName>CoreWindowsWrapper</AssemblyName>
1212
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<Deterministic>true</Deterministic>
@@ -33,6 +33,9 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36+
<Reference Include="Diga.Core.Api.Win32, Version=1.0.19.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\CoreWindowsWrapper\packages\Diga.Core.Api.Win32.1.0.19\lib\net472\Diga.Core.Api.Win32.dll</HintPath>
38+
</Reference>
3639
<Reference Include="System" />
3740
<Reference Include="System.Core" />
3841
<Reference Include="System.Drawing" />
@@ -203,10 +206,10 @@
203206
<Compile Include="Properties\AssemblyInfo.cs" />
204207
</ItemGroup>
205208
<ItemGroup>
206-
<ProjectReference Include="..\Diga.Core.Api.Win32\Diga.Core.Api.Win32.csproj">
207-
<Project>{5318af90-e3ed-4eb1-80f6-42d217653ace}</Project>
208-
<Name>Diga.Core.Api.Win32</Name>
209-
</ProjectReference>
209+
<None Include="packages.config" />
210210
</ItemGroup>
211211
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
212+
<PropertyGroup>
213+
<PostBuildEvent>copy $(TargetPath) $(SolutionDir)..\package_create\lib\net472\*</PostBuildEvent>
214+
</PropertyGroup>
212215
</Project>

‎Src/CoreWindowsWrapper.FW/Properties/AssemblyInfo.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
// Allgemeine Informationen über eine Assembly werden über die folgenden
66
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
77
// die einer Assembly zugeordnet sind.
8-
[assembly: AssemblyTitle("CoreWindowsWrapperFramework")]
9-
[assembly: AssemblyDescription("")]
8+
[assembly: AssemblyTitle("CoreWindowsWrapper")]
9+
[assembly: AssemblyDescription("CoreWindowsWrapper")]
1010
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("CoreWindowsWrapperFramework")]
13-
[assembly: AssemblyCopyright("Copyright © 2020")]
14-
[assembly: AssemblyTrademark("")]
11+
[assembly: AssemblyCompany("Dip.-Ing.(FH) Guido Agnesmeyer")]
12+
[assembly: AssemblyProduct("CoreWindowsWrapper")]
13+
[assembly: AssemblyCopyright("Copyright © 2020 Dip.-Ing.(FH) Guido Agnesmeyer")]
14+
[assembly: AssemblyTrademark("CoreWindowsWrapper")]
1515
[assembly: AssemblyCulture("")]
1616

1717
// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
@@ -32,5 +32,5 @@
3232
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
3333
// indem Sie "*" wie unten gezeigt eingeben:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
35+
[assembly: AssemblyVersion("1.0.4.1")]
36+
[assembly: AssemblyFileVersion("1.0.4.1")]

‎Src/CoreWindowsWrapper.FW/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Diga.Core.Api.Win32" version="1.0.19" targetFramework="net472" developmentDependency="true" />
4+
</packages>

‎Src/CoreWindowsWrapper/CoreWindowsWrapper.csproj‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PropertyGroup>
1212
<TargetFramework>netcoreapp3.1</TargetFramework>
1313
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
14-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
14+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
1515
<Authors>Dipl.-Ing.(FH) Guido Agnesmeyer</Authors>
1616
<RepositoryUrl>https://github.com/ITAgnesmeyer/CoreWindowsWrapper.git</RepositoryUrl>
1717
<PackageTags>dotnet-core</PackageTags>
@@ -20,14 +20,14 @@
2020
<PackageLicenseUrl></PackageLicenseUrl>
2121
<RepositoryType>GitHub</RepositoryType>
2222
<PackageProjectUrl>https://github.com/ITAgnesmeyer/CoreWindowsWrapper</PackageProjectUrl>
23-
<PackageReleaseNotes>First implementation.
23+
<PackageReleaseNotes>BugFixes
2424
</PackageReleaseNotes>
25-
<Version>1.0.3.3</Version>
25+
<Version>1.0.4.1</Version>
2626
<SignAssembly>false</SignAssembly>
2727
<DelaySign>true</DelaySign>
2828
<AssemblyOriginatorKeyFile>guido_agnesmeyer_2019.cer</AssemblyOriginatorKeyFile>
29-
<AssemblyVersion>1.0.3.3</AssemblyVersion>
30-
<FileVersion>1.0.3.3</FileVersion>
29+
<AssemblyVersion>1.0.4.1</AssemblyVersion>
30+
<FileVersion>1.0.4.1</FileVersion>
3131
<ApplicationIcon />
3232
<Win32Resource></Win32Resource>
3333
<PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -48,7 +48,7 @@
4848
</ItemGroup>
4949

5050
<ItemGroup>
51-
<ProjectReference Include="..\Diga.Core.Api.Win32.Core\Diga.Core.Api.Win32.Core.csproj" />
51+
<PackageReference Include="Diga.Core.Api.Win32.Core" Version="1.0.19" />
5252
</ItemGroup>
5353

5454
<ItemGroup>
@@ -66,4 +66,8 @@
6666
</EmbeddedResource>
6767
</ItemGroup>
6868

69+
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
70+
<Exec Command="copy $(TargetPath) $(SolutionDir)..\package_create\lib\netcoreapp3.1\*" />
71+
</Target>
72+
6973
</Project>

‎Src/CoreWindowsWrapper/CoreWindowsWrapper.sln‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleCaller", "..\ConsleC
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DIGAAppSetup", "..\DIGAAppSetup\DIGAAppSetup.csproj", "{23D5F6D3-123B-4001-AF52-69679E38AE58}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diga.Core.Api.Win32.Core", "..\Diga.Core.Api.Win32.Core\Diga.Core.Api.Win32.Core.csproj", "{E6762433-A688-47CC-82DF-34485D912BB9}"
13-
EndProject
1412
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Diga.NativeControls.WebBrowser.Core", "..\Diga.NativeControls.WebBrowser.Core\Diga.NativeControls.WebBrowser.Core.csproj", "{5446BF2C-72A4-4134-8F20-D45BB10B5F2B}"
1513
EndProject
1614
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreWindowsWrapper.FW", "..\CoreWindowsWrapper.FW\CoreWindowsWrapper.FW.csproj", "{6F2DD37F-8132-4177-B0A1-F4F36C3D2590}"
1715
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diga.Core.Api.Win32", "..\Diga.Core.Api.Win32\Diga.Core.Api.Win32.csproj", "{5318AF90-E3ED-4EB1-80F6-42D217653ACE}"
19-
EndProject
2016
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diga.NativeControls.WebBrowser", "..\Diga.NativeControls.WebBrowser\Diga.NativeControls.WebBrowser.csproj", "{5A726955-C418-4DD9-898A-336BE2630BFD}"
2117
EndProject
2218
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsTest", "..\WinFormsTest\WinFormsTest.csproj", "{13FE7929-0133-4E47-9C58-B7697DE283AC}"
@@ -67,18 +63,6 @@ Global
6763
{23D5F6D3-123B-4001-AF52-69679E38AE58}.Release|x64.Build.0 = Release|Any CPU
6864
{23D5F6D3-123B-4001-AF52-69679E38AE58}.Release|x86.ActiveCfg = Release|Any CPU
6965
{23D5F6D3-123B-4001-AF52-69679E38AE58}.Release|x86.Build.0 = Release|Any CPU
70-
{E6762433-A688-47CC-82DF-34485D912BB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
71-
{E6762433-A688-47CC-82DF-34485D912BB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
72-
{E6762433-A688-47CC-82DF-34485D912BB9}.Debug|x64.ActiveCfg = Debug|Any CPU
73-
{E6762433-A688-47CC-82DF-34485D912BB9}.Debug|x64.Build.0 = Debug|Any CPU
74-
{E6762433-A688-47CC-82DF-34485D912BB9}.Debug|x86.ActiveCfg = Debug|Any CPU
75-
{E6762433-A688-47CC-82DF-34485D912BB9}.Debug|x86.Build.0 = Debug|Any CPU
76-
{E6762433-A688-47CC-82DF-34485D912BB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
77-
{E6762433-A688-47CC-82DF-34485D912BB9}.Release|Any CPU.Build.0 = Release|Any CPU
78-
{E6762433-A688-47CC-82DF-34485D912BB9}.Release|x64.ActiveCfg = Release|Any CPU
79-
{E6762433-A688-47CC-82DF-34485D912BB9}.Release|x64.Build.0 = Release|Any CPU
80-
{E6762433-A688-47CC-82DF-34485D912BB9}.Release|x86.ActiveCfg = Release|Any CPU
81-
{E6762433-A688-47CC-82DF-34485D912BB9}.Release|x86.Build.0 = Release|Any CPU
8266
{5446BF2C-72A4-4134-8F20-D45BB10B5F2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8367
{5446BF2C-72A4-4134-8F20-D45BB10B5F2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
8468
{5446BF2C-72A4-4134-8F20-D45BB10B5F2B}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -103,18 +87,6 @@ Global
10387
{6F2DD37F-8132-4177-B0A1-F4F36C3D2590}.Release|x64.Build.0 = Release|Any CPU
10488
{6F2DD37F-8132-4177-B0A1-F4F36C3D2590}.Release|x86.ActiveCfg = Release|Any CPU
10589
{6F2DD37F-8132-4177-B0A1-F4F36C3D2590}.Release|x86.Build.0 = Release|Any CPU
106-
{5318AF90-E3ED-4EB1-80F6-42D217653ACE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
107-
{5318AF90-E3ED-4EB1-80F6-42D217653ACE}.Debug|Any CPU.Build.0 = Debug|Any CPU
108-
{5318AF90-E3ED-4EB1-80F6-42D217653ACE}.Debug|x64.ActiveCfg = Debug|Any CPU
109-
{5318AF90-E3ED-4EB1-80F6-42D217653ACE}.Debug|x64.Build.0 = Debug|Any CPU
110-
{5318AF90-E3ED-4EB1-80F6-42D217653ACE}.Debug|x86.ActiveCfg = Debug|Any CPU
111-
{5318AF90-E3ED-4EB1-80F6-42D217653ACE}.Debug|x86.Build.0 = Debug|Any CPU
112-
{5318AF90-E3ED-4EB1-80F6-42D217653ACE}.Release|Any CPU.ActiveCfg = Release|Any CPU
113-
{5318AF90-E3ED-4EB1-80F6-42D217653ACE}.Release|Any CPU.Build.0 = Release|Any CPU
114-
{5318AF90-E3ED-4EB1-80F6-42D217653ACE}.Release|x64.ActiveCfg = Release|Any CPU
115-
{5318AF90-E3ED-4EB1-80F6-42D217653ACE}.Release|x64.Build.0 = Release|Any CPU
116-
{5318AF90-E3ED-4EB1-80F6-42D217653ACE}.Release|x86.ActiveCfg = Release|Any CPU
117-
{5318AF90-E3ED-4EB1-80F6-42D217653ACE}.Release|x86.Build.0 = Release|Any CPU
11890
{5A726955-C418-4DD9-898A-336BE2630BFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
11991
{5A726955-C418-4DD9-898A-336BE2630BFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
12092
{5A726955-C418-4DD9-898A-336BE2630BFD}.Debug|x64.ActiveCfg = Debug|Any CPU

‎Src/DIGAAppSetup/DIGAAppSetup.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<ProjectReference Include="..\CoreWindowsWrapper\CoreWindowsWrapper.csproj" />
20+
<PackageReference Include="CoreWindowsWrapper" Version="1.0.41" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎Src/Diga.Core.Api.Win32.Core/Diga.Core.Api.Win32.Core.csproj‎

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎Src/Diga.Core.Api.Win32/ActCtx.cs‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎Src/Diga.Core.Api.Win32/ActCtxFlags.cs‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)