Skip to content

Commit

Permalink
Redid nuget
Browse files Browse the repository at this point in the history
  • Loading branch information
DaanV2 committed Jul 9, 2022
1 parent a7b9cae commit da96f46
Show file tree
Hide file tree
Showing 7 changed files with 122 additions and 102 deletions.
70 changes: 51 additions & 19 deletions Config Handling.Net.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29201.188
# Visual Studio Version 17
VisualStudioVersion = 17.2.32616.157
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FD6CECFD-07E0-438F-89E7-4417165ACD25}"
ProjectSection(SolutionItems) = preProject
Expand Down Expand Up @@ -37,26 +37,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{8D
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Net4.8", "Debugger\Debugger.Net4.8\Debugger.Net4.8.csproj", "{10742EEB-5C82-44DE-9CFC-761D4C992972}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net5.0", "API\Net5.0\Net5.0.csproj", "{57C484C6-2F8A-4575-B26A-26936F10E426}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net5.0", "API\Net5.0\Net5.0.csproj", "{57C484C6-2F8A-4575-B26A-26936F10E426}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Net 5.0", "UnitTest\Test.Net 5.0\Test.Net 5.0.csproj", "{2D7DF1C2-5183-4AC3-85EC-9B54CEE5BA66}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.Net 5.0", "UnitTest\Test.Net 5.0\Test.Net 5.0.csproj", "{2D7DF1C2-5183-4AC3-85EC-9B54CEE5BA66}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net6.0", "API\Net6.0\Net6.0.csproj", "{22011E15-1A4E-44AA-B3A5-9978E18150F1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.Net 6.0", "UnitTest\Test.Net 6.0\Test.Net 6.0.csproj", "{6EF91884-2881-428D-B2D7-2EED22E4C032}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Source\Source.projitems*{00a1bbd4-1430-406c-bed3-cd6c204aab45}*SharedItemsImports = 5
UnitTest\Test - Source\Test - Source.projitems*{00a1bbd4-1430-406c-bed3-cd6c204aab45}*SharedItemsImports = 5
Source\Source.projitems*{201d4500-e4bc-46b8-80e9-57ff321bd016}*SharedItemsImports = 5
Source\Source.projitems*{2448fb86-2a8c-4378-bccb-7faaf497e8ab}*SharedItemsImports = 5
Source\Source.projitems*{27e779d8-96e0-4d62-a499-e57b4b358b58}*SharedItemsImports = 4
UnitTest\Test - Source\Test - Source.projitems*{27e779d8-96e0-4d62-a499-e57b4b358b58}*SharedItemsImports = 4
UnitTest\Test - Source\Test - Source.projitems*{2d7df1c2-5183-4ac3-85ec-9b54cee5ba66}*SharedItemsImports = 5
Source\Source.projitems*{57c484c6-2f8a-4575-b26a-26936f10e426}*SharedItemsImports = 5
Source\Source.projitems*{7be2b6ac-c642-4c82-9bb6-49c280b21a6d}*SharedItemsImports = 13
UnitTest\Test - Source\Test - Source.projitems*{7c1dfdd9-efe7-4b43-9b53-d518d8f0b44e}*SharedItemsImports = 13
Source\Source.projitems*{9b91c88f-52ff-42a9-83b6-2aed5d94249c}*SharedItemsImports = 4
Source\Source.projitems*{a838d268-ca30-46b3-a412-b2771b63e30b}*SharedItemsImports = 5
Source\Source.projitems*{dfad159a-8060-4398-9256-d928e7d36faa}*SharedItemsImports = 5
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Expand Down Expand Up @@ -186,6 +175,30 @@ Global
{2D7DF1C2-5183-4AC3-85EC-9B54CEE5BA66}.Release|x64.Build.0 = Release|x64
{2D7DF1C2-5183-4AC3-85EC-9B54CEE5BA66}.Release|x86.ActiveCfg = Release|x86
{2D7DF1C2-5183-4AC3-85EC-9B54CEE5BA66}.Release|x86.Build.0 = Release|x86
{22011E15-1A4E-44AA-B3A5-9978E18150F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{22011E15-1A4E-44AA-B3A5-9978E18150F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{22011E15-1A4E-44AA-B3A5-9978E18150F1}.Debug|x64.ActiveCfg = Debug|x64
{22011E15-1A4E-44AA-B3A5-9978E18150F1}.Debug|x64.Build.0 = Debug|x64
{22011E15-1A4E-44AA-B3A5-9978E18150F1}.Debug|x86.ActiveCfg = Debug|x86
{22011E15-1A4E-44AA-B3A5-9978E18150F1}.Debug|x86.Build.0 = Debug|x86
{22011E15-1A4E-44AA-B3A5-9978E18150F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{22011E15-1A4E-44AA-B3A5-9978E18150F1}.Release|Any CPU.Build.0 = Release|Any CPU
{22011E15-1A4E-44AA-B3A5-9978E18150F1}.Release|x64.ActiveCfg = Release|x64
{22011E15-1A4E-44AA-B3A5-9978E18150F1}.Release|x64.Build.0 = Release|x64
{22011E15-1A4E-44AA-B3A5-9978E18150F1}.Release|x86.ActiveCfg = Release|x86
{22011E15-1A4E-44AA-B3A5-9978E18150F1}.Release|x86.Build.0 = Release|x86
{6EF91884-2881-428D-B2D7-2EED22E4C032}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6EF91884-2881-428D-B2D7-2EED22E4C032}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6EF91884-2881-428D-B2D7-2EED22E4C032}.Debug|x64.ActiveCfg = Debug|x64
{6EF91884-2881-428D-B2D7-2EED22E4C032}.Debug|x64.Build.0 = Debug|x64
{6EF91884-2881-428D-B2D7-2EED22E4C032}.Debug|x86.ActiveCfg = Debug|x86
{6EF91884-2881-428D-B2D7-2EED22E4C032}.Debug|x86.Build.0 = Debug|x86
{6EF91884-2881-428D-B2D7-2EED22E4C032}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6EF91884-2881-428D-B2D7-2EED22E4C032}.Release|Any CPU.Build.0 = Release|Any CPU
{6EF91884-2881-428D-B2D7-2EED22E4C032}.Release|x64.ActiveCfg = Release|x64
{6EF91884-2881-428D-B2D7-2EED22E4C032}.Release|x64.Build.0 = Release|x64
{6EF91884-2881-428D-B2D7-2EED22E4C032}.Release|x86.ActiveCfg = Release|x86
{6EF91884-2881-428D-B2D7-2EED22E4C032}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -203,8 +216,27 @@ Global
{10742EEB-5C82-44DE-9CFC-761D4C992972} = {8D8E0230-6DB0-4D89-88B5-9BFE8CB17E30}
{57C484C6-2F8A-4575-B26A-26936F10E426} = {3D19909E-B3A0-4E51-951E-0D813A992A81}
{2D7DF1C2-5183-4AC3-85EC-9B54CEE5BA66} = {0BBFBE24-89D4-4D6B-B775-EBEC0B2F65FB}
{22011E15-1A4E-44AA-B3A5-9978E18150F1} = {3D19909E-B3A0-4E51-951E-0D813A992A81}
{6EF91884-2881-428D-B2D7-2EED22E4C032} = {0BBFBE24-89D4-4D6B-B775-EBEC0B2F65FB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6070D33A-069E-4D11-B844-6B794530F980}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Source\Source.projitems*{00a1bbd4-1430-406c-bed3-cd6c204aab45}*SharedItemsImports = 5
UnitTest\Test - Source\Test - Source.projitems*{00a1bbd4-1430-406c-bed3-cd6c204aab45}*SharedItemsImports = 5
Source\Source.projitems*{201d4500-e4bc-46b8-80e9-57ff321bd016}*SharedItemsImports = 5
Source\Source.projitems*{22011e15-1a4e-44aa-b3a5-9978e18150f1}*SharedItemsImports = 5
Source\Source.projitems*{2448fb86-2a8c-4378-bccb-7faaf497e8ab}*SharedItemsImports = 5
Source\Source.projitems*{27e779d8-96e0-4d62-a499-e57b4b358b58}*SharedItemsImports = 4
UnitTest\Test - Source\Test - Source.projitems*{27e779d8-96e0-4d62-a499-e57b4b358b58}*SharedItemsImports = 4
UnitTest\Test - Source\Test - Source.projitems*{2d7df1c2-5183-4ac3-85ec-9b54cee5ba66}*SharedItemsImports = 5
Source\Source.projitems*{57c484c6-2f8a-4575-b26a-26936f10e426}*SharedItemsImports = 5
UnitTest\Test - Source\Test - Source.projitems*{6ef91884-2881-428d-b2d7-2eed22e4c032}*SharedItemsImports = 5
Source\Source.projitems*{7be2b6ac-c642-4c82-9bb6-49c280b21a6d}*SharedItemsImports = 13
UnitTest\Test - Source\Test - Source.projitems*{7c1dfdd9-efe7-4b43-9b53-d518d8f0b44e}*SharedItemsImports = 13
Source\Source.projitems*{9b91c88f-52ff-42a9-83b6-2aed5d94249c}*SharedItemsImports = 4
Source\Source.projitems*{a838d268-ca30-46b3-a412-b2771b63e30b}*SharedItemsImports = 5
Source\Source.projitems*{dfad159a-8060-4398-9256-d928e7d36faa}*SharedItemsImports = 5
EndGlobalSection
EndGlobal
45 changes: 45 additions & 0 deletions Config-Handling.Net.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<!-- Required elements-->
<id>Config-Handling.Net</id>
<version>1.1.0</version>
<description>ConfigHandling.Net takes care of all your config or options objects. It takes care of saving, loading, and persistence of objects in memory. Config objects are saved in a centralized location.</description>
<authors>Daan Verstraten</authors>
<title>Config-Handling.Net</title>

<!-- Optional elements -->
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="file">LICENSE.txt</license>
<projectUrl>https://github.com/DaanV2/Config-Handling.Net</projectUrl>
<copyright>Daan Verstraten 2018</copyright>
<tags>config config-management</tags>
<repository type="git" url="https://github.com/DaanV2/Config-Handling.Net" />
<releaseNotes>Fixing config.ini</releaseNotes>
<icon>images\icon.png</icon>
<dependencies>
<group targetFramework=".NETCoreApp3.1" />
<group targetFramework=".NETCore5.0" />
<group targetFramework=".NET6.0" />
<group targetFramework=".NETFramework4.8" />
<group targetFramework=".NETStandard2.0" />
<group targetFramework=".NETStandard2.1" />
</dependencies>

<!-- ... -->
</metadata>
<!-- Optional 'files' node -->
<files>
<file src=".\Nuget\images\icon.png" target="images\" />
<file src=".\LICENSE.txt" target="" />

<!-- Any CPU -->
<file src="API\Framework4.8\bin\Release\*.*" target="lib\net48" exclude="*.tmp;*.pdb"/>
<file src="API\Net5.0\bin\Release\net5.0\*.*" target="lib\netcore50" exclude="*.tmp;*.pdb"/>
<file src="API\Net6.0\bin\Release\net6.0\*.*" target="lib\netcore60" exclude="*.tmp;*.pdb"/>
<file src="API\NetCore3.0\bin\Release\netcoreapp3.0\*.*" target="lib\netcoreapp3.0" exclude="*.tmp;*.pdb"/>
<file src="API\NetCore3.1\bin\Release\netcoreapp3.1\*.*" target="lib\netcoreapp3.1" exclude="*.tmp;*.pdb"/>
<file src="API\Standard2.0\bin\Release\netstandard2.0\*.*" target="lib\netstandard2.0" exclude="*.tmp;*.pdb"/>
<file src="API\Standard2.1\bin\Release\netstandard2.1\*.*" target="lib\netstandard2.1" exclude="*.tmp;*.pdb"/>
</files>
</package>
60 changes: 0 additions & 60 deletions Nuget/Config-Handling.Net.nuspec

This file was deleted.

12 changes: 0 additions & 12 deletions Nuget/Nuget Build.md

This file was deleted.

2 changes: 0 additions & 2 deletions Nuget/build.bat

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using DaanV2.Config;
using DaanV2.Config;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace Config.Test {
Expand All @@ -12,15 +7,12 @@ public partial class ConfigMapperTest {
[TestMethod]
public void TestPresistance() {
FakeConfig Config = ConfigMapper.Get<FakeConfig>(false);

Assert.IsFalse(ConfigMapper.Configs.ContainsKey(Config.GetType()), "Presistance avoidance failed");

Config = (FakeConfig)ConfigMapper.Get(typeof(FakeConfig), false);

Assert.IsFalse(ConfigMapper.Configs.ContainsKey(Config.GetType()), "Presistance avoidance failed");

Config = ConfigMapper.Get<FakeConfig>();

Assert.IsTrue(ConfigMapper.Configs.ContainsKey(Config.GetType()), "Presistance failed");
}
}
Expand Down
25 changes: 25 additions & 0 deletions UnitTest/Test.Net 6.0/Test.Net 6.0.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>Test.Net_6._0</RootNamespace>

<IsPackable>false</IsPackable>

<Platforms>AnyCPU;x86;x64</Platforms>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
<PackageReference Include="coverlet.collector" Version="1.3.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\API\Net6.0\Net6.0.csproj" />
</ItemGroup>

<Import Project="..\Test - Source\Test - Source.projitems" Label="Shared" />

</Project>

0 comments on commit da96f46

Please sign in to comment.