diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml new file mode 100644 index 0000000..eeab6e8 --- /dev/null +++ b/.github/workflows/dotnet.yml @@ -0,0 +1,19 @@ +name: .NET +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v5 + - name: Setup .NET + uses: actions/setup-dotnet@v5 + with: + global-json-file: global.json + - name: Build + run: dotnet build --verbosity quiet + - name: Test + run: dotnet test --no-build --verbosity minimal diff --git a/.github/workflows/nuget-publish.yml b/.github/workflows/nuget-publish.yml new file mode 100644 index 0000000..b582b62 --- /dev/null +++ b/.github/workflows/nuget-publish.yml @@ -0,0 +1,35 @@ +name: NuGet Publish +on: + workflow_dispatch: + inputs: + publish_nuget: + description: 'Publish to NuGet.org' + required: false + type: boolean + default: false + publish_myget: + description: 'Publish to MyGet' + required: false + type: boolean + default: false +jobs: + pack: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v5 + - name: Setup .NET + uses: actions/setup-dotnet@v5 + with: + global-json-file: global.json + - name: Pack + run: bash scripts/nuget-pack.sh + - name: Push to NuGet.org + if: ${{ inputs.publish_nuget }} + run: bash scripts/nuget-push.sh --source nuget --api-key-env NUGET_API_KEY + env: + NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} + - name: Push to MyGet + if: ${{ inputs.publish_myget }} + run: bash scripts/nuget-push.sh --source myget --api-key-env MYGET_API_KEY + env: + MYGET_API_KEY: ${{ secrets.MYGET_API_KEY }} diff --git a/.gitignore b/.gitignore index 16d5b9a..671f402 100644 --- a/.gitignore +++ b/.gitignore @@ -136,6 +136,7 @@ publish/ # NuGet Packages *.nupkg +artifacts/ # The packages folder can be ignored because of Package Restore **/packages/* # except build/, which is used as an MSBuild target. diff --git a/Cfg.Net.sln b/Cfg.Net.sln index 20c72f3..0f14498 100644 --- a/Cfg.Net.sln +++ b/Cfg.Net.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.2.32526.322 @@ -6,354 +6,128 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{937D9058-D53A-4341-B076-284442EADE2D}" ProjectSection(SolutionItems) = preProject .gitignore = .gitignore - appveyor.yml = appveyor.yml + global.json = global.json README.md = README.md - WE-Markdown.css = WE-Markdown.css EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Articles", "Articles", "{8BF2C711-7979-40D0-AE9D-A4F57340C50E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{8BF2C711-7979-40D0-AE9D-A4F57340C50E}" ProjectSection(SolutionItems) = preProject - Articles\Autofac.md = Articles\Autofac.md - Articles\EnvironmentsAndParameters.md = Articles\EnvironmentsAndParameters.md - Articles\Shorthand.md = Articles\Shorthand.md + docs\autofac.md = docs\autofac.md + docs\environments-and-parameters.md = docs\environments-and-parameters.md + docs\nuget-packaging.md = docs\nuget-packaging.md + docs\shorthand.md = docs\shorthand.md EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nuget", "Nuget", "{5FE37D04-9941-449E-9376-4C7BCA579F8B}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{5FE37D04-9941-449E-9376-4C7BCA579F8B}" ProjectSection(SolutionItems) = preProject - Nuget\Cfg.Net.Environment.nuspec = Nuget\Cfg.Net.Environment.nuspec - Nuget\Cfg.Net.nuspec = Nuget\Cfg.Net.nuspec - Nuget\Cfg.Net.Parser.Json.Net.nuspec = Nuget\Cfg.Net.Parser.Json.Net.nuspec - Nuget\Cfg.Net.Parser.Xml.Linq.nuspec = Nuget\Cfg.Net.Parser.Xml.Linq.nuspec - Nuget\Cfg.Net.Parser.YamlDotNet.nuspec = Nuget\Cfg.Net.Parser.YamlDotNet.nuspec - Nuget\Cfg.Net.Reader.nuspec = Nuget\Cfg.Net.Reader.nuspec - Nuget\Cfg.Net.Readers.FileSystemWatcherReader.nuspec = Nuget\Cfg.Net.Readers.FileSystemWatcherReader.nuspec - Nuget\Cfg.Net.Shorthand.nuspec = Nuget\Cfg.Net.Shorthand.nuspec - Nuget\myget.bat = Nuget\myget.bat - Nuget\nuget.bat = Nuget\nuget.bat + scripts\nuget-pack.sh = scripts\nuget-pack.sh + scripts\nuget-push.sh = scripts\nuget-push.sh EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{856D08A7-0AE3-42C1-A811-75B59C0045BE}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflows", "Workflows", "{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}" + ProjectSection(SolutionItems) = preProject + .github\workflows\dotnet.yml = .github\workflows\dotnet.yml + .github\workflows\nuget-publish.yml = .github\workflows\nuget-publish.yml + EndProjectSection EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Cfg.Net.Shared", "src\Main\Cfg.Net.Shared\Cfg.Net.Shared.shproj", "{20ECB16C-D7E6-41CA-A8ED-3C197057ECCD}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{856D08A7-0AE3-42C1-A811-75B59C0045BE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cfg.Net.Standard.20", "src\Main\Cfg.Net.Standard.20\Cfg.Net.Standard.20.csproj", "{50BEB203-FEA0-47FD-9BC1-4B2ECCC91377}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cfg.Net", "src\Main\Cfg.Net\Cfg.Net.csproj", "{50BEB203-FEA0-47FD-9BC1-4B2ECCC91377}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Readers", "Readers", "{C3F93254-98AD-40BD-89C4-AFF840BF2C37}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Default", "Default", "{059A19FD-88D2-4BF4-B0E2-19192C954EA4}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Cfg.Net.Reader.Shared", "src\Readers\Default\Cfg.Net.Reader.Shared\Cfg.Net.Reader.Shared.shproj", "{C76FC002-10FD-4A69-AF1A-1C9260EC6807}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cfg.Net.Reader", "src\Readers\Default\Cfg.Net.Reader\Cfg.Net.Reader.csproj", "{44C47FC7-E690-4FCE-839A-95CA28CE51B6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cfg.Net.Reader.Standard.20", "src\Readers\Default\Cfg.Net.Reader.Standard.20\Cfg.Net.Reader.Standard.20.csproj", "{44C47FC7-E690-4FCE-839A-95CA28CE51B6}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FileSystemWatcherReader", "FileSystemWatcherReader", "{E0C19E77-50A6-4FC9-96F2-B6FBA588A9B3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileSystemWatcherReader", "src\Readers\FileSystemWatcherReader\FileSystemWatcherReader.csproj", "{C9FD840A-D479-41AF-A271-5023AF4A03ED}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Parsers", "Parsers", "{BDE74344-ADEE-424F-AF06-BB37D2D493B5}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Customizers", "Customizers", "{D7A50A64-07B3-4325-B814-294CE6390293}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YamlDotNet", "src\Parsers\YamlDotNet\YamlDotNet.csproj", "{A55DD800-321B-44C2-A26E-D1CE375FB325}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Environment", "Environment", "{B902824A-989D-44A3-A93E-FFBD8C531154}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xml.Linq", "src\Parsers\Xml.Linq\Xml.Linq.csproj", "{BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shorthand", "Shorthand", "{D2687546-4D86-4E58-90CA-C606EE9F4E16}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Json", "src\Parsers\Json\Json.csproj", "{A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Customizers", "Customizers", "{D7A50A64-07B3-4325-B814-294CE6390293}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Cfg.Net.Environment.Shared", "src\Customizers\Environment\Cfg.Net.Environment.Shared\Cfg.Net.Environment.Shared.shproj", "{D17D76EA-69C0-4EC1-8E35-D15C4EB3F4B0}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Environment", "Environment", "{B902824A-989D-44A3-A93E-FFBD8C531154}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cfg.Net.Environment.Standard.20", "src\Customizers\Environment\Cfg.Net.Environment.Standard.20\Cfg.Net.Environment.Standard.20.csproj", "{EC2F5376-3078-412C-9EF6-3F4167B08F2B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cfg.Net.Environment", "src\Customizers\Environment\Cfg.Net.Environment\Cfg.Net.Environment.csproj", "{EC2F5376-3078-412C-9EF6-3F4167B08F2B}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Cfg.Net.Shorthand.Shared", "src\Customizers\Shorthand\Cfg.Net.Shorthand.Shared\Cfg.Net.Shorthand.Shared.shproj", "{28DA6C7F-A14D-4787-9D61-457997288D99}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shorthand", "Shorthand", "{D2687546-4D86-4E58-90CA-C606EE9F4E16}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cfg.Net.Shorthand.Standard.20", "src\Customizers\Shorthand\Cfg.Net.Shorthand.Standard.20\Cfg.Net.Shorthand.Standard.20.csproj", "{43FA3F95-0516-4D66-938E-266C0F961C79}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cfg.Net.Shorthand", "src\Customizers\Shorthand\Cfg.Net.Shorthand\Cfg.Net.Shorthand.csproj", "{43FA3F95-0516-4D66-938E-266C0F961C79}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{22D31767-F452-4B97-891A-2B5FDBBC0513}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestNetCore", "Testing\TestNetCore\TestNetCore.csproj", "{F2A6877B-7452-432A-8E6C-0B809FCCE860}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestShared", "Testing\TestShared\TestShared.shproj", "{ABB72FFC-C11C-493C-865A-2F13009C1937}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FileSystemWatcherReader", "FileSystemWatcherReader", "{E0C19E77-50A6-4FC9-96F2-B6FBA588A9B3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileSystemWatcherReader.Standard.20", "src\Readers\FileSystemWatcherReader\FileSystemWatcherReader.Standard.20\FileSystemWatcherReader.Standard.20.csproj", "{C9FD840A-D479-41AF-A271-5023AF4A03ED}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cfg.Net.Standard.21", "src\Main\Cfg.Net.Standard.21\Cfg.Net.Standard.21.csproj", "{689483C1-2635-4F53-BF30-B2080164284F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cfg.Net.Environment.Standard.21", "src\Customizers\Environment\Cfg.Net.Environment.Standard.21\Cfg.Net.Environment.Standard.21.csproj", "{B1AFA554-1949-4269-B9AD-E90452102FB7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cfg.Net.Shorthand.Standard.21", "src\Customizers\Shorthand\Cfg.Net.Shorthand.Standard.21\Cfg.Net.Shorthand.Standard.21.csproj", "{BB1FDC48-59DD-4853-AFDA-E26602C09153}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cfg.Net.Reader.Standard.21", "src\Readers\Default\Cfg.Net.Reader.Standard.21\Cfg.Net.Reader.Standard.21.csproj", "{B9BCD96F-8C6F-4F86-A1FA-36D2629EFE9E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YamlDotNet", "src\Parsers\YamlDotNet\YamlDotNet.csproj", "{A55DD800-321B-44C2-A26E-D1CE375FB325}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xml.Linq", "src\Parsers\Xml.Linq\Xml.Linq.csproj", "{BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Json.Net", "src\Parsers\Json.Net\Json.Net.csproj", "{A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|ARM = Release|ARM - Release|x64 = Release|x64 - Release|x86 = Release|x86 - Description = An alternative .NET configuration handler. EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {50BEB203-FEA0-47FD-9BC1-4B2ECCC91377}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {50BEB203-FEA0-47FD-9BC1-4B2ECCC91377}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50BEB203-FEA0-47FD-9BC1-4B2ECCC91377}.Debug|ARM.ActiveCfg = Debug|Any CPU - {50BEB203-FEA0-47FD-9BC1-4B2ECCC91377}.Debug|ARM.Build.0 = Debug|Any CPU - {50BEB203-FEA0-47FD-9BC1-4B2ECCC91377}.Debug|x64.ActiveCfg = Debug|Any CPU - {50BEB203-FEA0-47FD-9BC1-4B2ECCC91377}.Debug|x64.Build.0 = Debug|Any CPU - {50BEB203-FEA0-47FD-9BC1-4B2ECCC91377}.Debug|x86.ActiveCfg = Debug|Any CPU - {50BEB203-FEA0-47FD-9BC1-4B2ECCC91377}.Debug|x86.Build.0 = Debug|Any CPU {50BEB203-FEA0-47FD-9BC1-4B2ECCC91377}.Release|Any CPU.ActiveCfg = Release|Any CPU {50BEB203-FEA0-47FD-9BC1-4B2ECCC91377}.Release|Any CPU.Build.0 = Release|Any CPU - {50BEB203-FEA0-47FD-9BC1-4B2ECCC91377}.Release|ARM.ActiveCfg = Release|Any CPU - {50BEB203-FEA0-47FD-9BC1-4B2ECCC91377}.Release|ARM.Build.0 = Release|Any CPU - {50BEB203-FEA0-47FD-9BC1-4B2ECCC91377}.Release|x64.ActiveCfg = Release|Any CPU - {50BEB203-FEA0-47FD-9BC1-4B2ECCC91377}.Release|x64.Build.0 = Release|Any CPU - {50BEB203-FEA0-47FD-9BC1-4B2ECCC91377}.Release|x86.ActiveCfg = Release|Any CPU - {50BEB203-FEA0-47FD-9BC1-4B2ECCC91377}.Release|x86.Build.0 = Release|Any CPU {44C47FC7-E690-4FCE-839A-95CA28CE51B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {44C47FC7-E690-4FCE-839A-95CA28CE51B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44C47FC7-E690-4FCE-839A-95CA28CE51B6}.Debug|ARM.ActiveCfg = Debug|Any CPU - {44C47FC7-E690-4FCE-839A-95CA28CE51B6}.Debug|ARM.Build.0 = Debug|Any CPU - {44C47FC7-E690-4FCE-839A-95CA28CE51B6}.Debug|x64.ActiveCfg = Debug|Any CPU - {44C47FC7-E690-4FCE-839A-95CA28CE51B6}.Debug|x64.Build.0 = Debug|Any CPU - {44C47FC7-E690-4FCE-839A-95CA28CE51B6}.Debug|x86.ActiveCfg = Debug|Any CPU - {44C47FC7-E690-4FCE-839A-95CA28CE51B6}.Debug|x86.Build.0 = Debug|Any CPU {44C47FC7-E690-4FCE-839A-95CA28CE51B6}.Release|Any CPU.ActiveCfg = Release|Any CPU {44C47FC7-E690-4FCE-839A-95CA28CE51B6}.Release|Any CPU.Build.0 = Release|Any CPU - {44C47FC7-E690-4FCE-839A-95CA28CE51B6}.Release|ARM.ActiveCfg = Release|Any CPU - {44C47FC7-E690-4FCE-839A-95CA28CE51B6}.Release|ARM.Build.0 = Release|Any CPU - {44C47FC7-E690-4FCE-839A-95CA28CE51B6}.Release|x64.ActiveCfg = Release|Any CPU - {44C47FC7-E690-4FCE-839A-95CA28CE51B6}.Release|x64.Build.0 = Release|Any CPU - {44C47FC7-E690-4FCE-839A-95CA28CE51B6}.Release|x86.ActiveCfg = Release|Any CPU - {44C47FC7-E690-4FCE-839A-95CA28CE51B6}.Release|x86.Build.0 = Release|Any CPU - {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Debug|ARM.ActiveCfg = Debug|Any CPU - {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Debug|ARM.Build.0 = Debug|Any CPU - {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Debug|x64.ActiveCfg = Debug|Any CPU - {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Debug|x64.Build.0 = Debug|Any CPU - {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Debug|x86.ActiveCfg = Debug|Any CPU - {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Debug|x86.Build.0 = Debug|Any CPU - {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Release|Any CPU.Build.0 = Release|Any CPU - {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Release|ARM.ActiveCfg = Release|Any CPU - {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Release|ARM.Build.0 = Release|Any CPU - {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Release|x64.ActiveCfg = Release|Any CPU - {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Release|x64.Build.0 = Release|Any CPU - {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Release|x86.ActiveCfg = Release|Any CPU - {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Release|x86.Build.0 = Release|Any CPU - {43FA3F95-0516-4D66-938E-266C0F961C79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43FA3F95-0516-4D66-938E-266C0F961C79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43FA3F95-0516-4D66-938E-266C0F961C79}.Debug|ARM.ActiveCfg = Debug|Any CPU - {43FA3F95-0516-4D66-938E-266C0F961C79}.Debug|ARM.Build.0 = Debug|Any CPU - {43FA3F95-0516-4D66-938E-266C0F961C79}.Debug|x64.ActiveCfg = Debug|Any CPU - {43FA3F95-0516-4D66-938E-266C0F961C79}.Debug|x64.Build.0 = Debug|Any CPU - {43FA3F95-0516-4D66-938E-266C0F961C79}.Debug|x86.ActiveCfg = Debug|Any CPU - {43FA3F95-0516-4D66-938E-266C0F961C79}.Debug|x86.Build.0 = Debug|Any CPU - {43FA3F95-0516-4D66-938E-266C0F961C79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43FA3F95-0516-4D66-938E-266C0F961C79}.Release|Any CPU.Build.0 = Release|Any CPU - {43FA3F95-0516-4D66-938E-266C0F961C79}.Release|ARM.ActiveCfg = Release|Any CPU - {43FA3F95-0516-4D66-938E-266C0F961C79}.Release|ARM.Build.0 = Release|Any CPU - {43FA3F95-0516-4D66-938E-266C0F961C79}.Release|x64.ActiveCfg = Release|Any CPU - {43FA3F95-0516-4D66-938E-266C0F961C79}.Release|x64.Build.0 = Release|Any CPU - {43FA3F95-0516-4D66-938E-266C0F961C79}.Release|x86.ActiveCfg = Release|Any CPU - {43FA3F95-0516-4D66-938E-266C0F961C79}.Release|x86.Build.0 = Release|Any CPU - {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Debug|ARM.ActiveCfg = Debug|Any CPU - {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Debug|ARM.Build.0 = Debug|Any CPU - {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Debug|x64.ActiveCfg = Debug|Any CPU - {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Debug|x64.Build.0 = Debug|Any CPU - {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Debug|x86.ActiveCfg = Debug|Any CPU - {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Debug|x86.Build.0 = Debug|Any CPU - {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Release|Any CPU.Build.0 = Release|Any CPU - {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Release|ARM.ActiveCfg = Release|Any CPU - {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Release|ARM.Build.0 = Release|Any CPU - {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Release|x64.ActiveCfg = Release|Any CPU - {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Release|x64.Build.0 = Release|Any CPU - {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Release|x86.ActiveCfg = Release|Any CPU - {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Release|x86.Build.0 = Release|Any CPU {C9FD840A-D479-41AF-A271-5023AF4A03ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C9FD840A-D479-41AF-A271-5023AF4A03ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9FD840A-D479-41AF-A271-5023AF4A03ED}.Debug|ARM.ActiveCfg = Debug|Any CPU - {C9FD840A-D479-41AF-A271-5023AF4A03ED}.Debug|ARM.Build.0 = Debug|Any CPU - {C9FD840A-D479-41AF-A271-5023AF4A03ED}.Debug|x64.ActiveCfg = Debug|Any CPU - {C9FD840A-D479-41AF-A271-5023AF4A03ED}.Debug|x64.Build.0 = Debug|Any CPU - {C9FD840A-D479-41AF-A271-5023AF4A03ED}.Debug|x86.ActiveCfg = Debug|Any CPU - {C9FD840A-D479-41AF-A271-5023AF4A03ED}.Debug|x86.Build.0 = Debug|Any CPU {C9FD840A-D479-41AF-A271-5023AF4A03ED}.Release|Any CPU.ActiveCfg = Release|Any CPU {C9FD840A-D479-41AF-A271-5023AF4A03ED}.Release|Any CPU.Build.0 = Release|Any CPU - {C9FD840A-D479-41AF-A271-5023AF4A03ED}.Release|ARM.ActiveCfg = Release|Any CPU - {C9FD840A-D479-41AF-A271-5023AF4A03ED}.Release|ARM.Build.0 = Release|Any CPU - {C9FD840A-D479-41AF-A271-5023AF4A03ED}.Release|x64.ActiveCfg = Release|Any CPU - {C9FD840A-D479-41AF-A271-5023AF4A03ED}.Release|x64.Build.0 = Release|Any CPU - {C9FD840A-D479-41AF-A271-5023AF4A03ED}.Release|x86.ActiveCfg = Release|Any CPU - {C9FD840A-D479-41AF-A271-5023AF4A03ED}.Release|x86.Build.0 = Release|Any CPU - {689483C1-2635-4F53-BF30-B2080164284F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {689483C1-2635-4F53-BF30-B2080164284F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {689483C1-2635-4F53-BF30-B2080164284F}.Debug|ARM.ActiveCfg = Debug|Any CPU - {689483C1-2635-4F53-BF30-B2080164284F}.Debug|ARM.Build.0 = Debug|Any CPU - {689483C1-2635-4F53-BF30-B2080164284F}.Debug|x64.ActiveCfg = Debug|Any CPU - {689483C1-2635-4F53-BF30-B2080164284F}.Debug|x64.Build.0 = Debug|Any CPU - {689483C1-2635-4F53-BF30-B2080164284F}.Debug|x86.ActiveCfg = Debug|Any CPU - {689483C1-2635-4F53-BF30-B2080164284F}.Debug|x86.Build.0 = Debug|Any CPU - {689483C1-2635-4F53-BF30-B2080164284F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {689483C1-2635-4F53-BF30-B2080164284F}.Release|Any CPU.Build.0 = Release|Any CPU - {689483C1-2635-4F53-BF30-B2080164284F}.Release|ARM.ActiveCfg = Release|Any CPU - {689483C1-2635-4F53-BF30-B2080164284F}.Release|ARM.Build.0 = Release|Any CPU - {689483C1-2635-4F53-BF30-B2080164284F}.Release|x64.ActiveCfg = Release|Any CPU - {689483C1-2635-4F53-BF30-B2080164284F}.Release|x64.Build.0 = Release|Any CPU - {689483C1-2635-4F53-BF30-B2080164284F}.Release|x86.ActiveCfg = Release|Any CPU - {689483C1-2635-4F53-BF30-B2080164284F}.Release|x86.Build.0 = Release|Any CPU - {B1AFA554-1949-4269-B9AD-E90452102FB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1AFA554-1949-4269-B9AD-E90452102FB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1AFA554-1949-4269-B9AD-E90452102FB7}.Debug|ARM.ActiveCfg = Debug|Any CPU - {B1AFA554-1949-4269-B9AD-E90452102FB7}.Debug|ARM.Build.0 = Debug|Any CPU - {B1AFA554-1949-4269-B9AD-E90452102FB7}.Debug|x64.ActiveCfg = Debug|Any CPU - {B1AFA554-1949-4269-B9AD-E90452102FB7}.Debug|x64.Build.0 = Debug|Any CPU - {B1AFA554-1949-4269-B9AD-E90452102FB7}.Debug|x86.ActiveCfg = Debug|Any CPU - {B1AFA554-1949-4269-B9AD-E90452102FB7}.Debug|x86.Build.0 = Debug|Any CPU - {B1AFA554-1949-4269-B9AD-E90452102FB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1AFA554-1949-4269-B9AD-E90452102FB7}.Release|Any CPU.Build.0 = Release|Any CPU - {B1AFA554-1949-4269-B9AD-E90452102FB7}.Release|ARM.ActiveCfg = Release|Any CPU - {B1AFA554-1949-4269-B9AD-E90452102FB7}.Release|ARM.Build.0 = Release|Any CPU - {B1AFA554-1949-4269-B9AD-E90452102FB7}.Release|x64.ActiveCfg = Release|Any CPU - {B1AFA554-1949-4269-B9AD-E90452102FB7}.Release|x64.Build.0 = Release|Any CPU - {B1AFA554-1949-4269-B9AD-E90452102FB7}.Release|x86.ActiveCfg = Release|Any CPU - {B1AFA554-1949-4269-B9AD-E90452102FB7}.Release|x86.Build.0 = Release|Any CPU - {BB1FDC48-59DD-4853-AFDA-E26602C09153}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB1FDC48-59DD-4853-AFDA-E26602C09153}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB1FDC48-59DD-4853-AFDA-E26602C09153}.Debug|ARM.ActiveCfg = Debug|Any CPU - {BB1FDC48-59DD-4853-AFDA-E26602C09153}.Debug|ARM.Build.0 = Debug|Any CPU - {BB1FDC48-59DD-4853-AFDA-E26602C09153}.Debug|x64.ActiveCfg = Debug|Any CPU - {BB1FDC48-59DD-4853-AFDA-E26602C09153}.Debug|x64.Build.0 = Debug|Any CPU - {BB1FDC48-59DD-4853-AFDA-E26602C09153}.Debug|x86.ActiveCfg = Debug|Any CPU - {BB1FDC48-59DD-4853-AFDA-E26602C09153}.Debug|x86.Build.0 = Debug|Any CPU - {BB1FDC48-59DD-4853-AFDA-E26602C09153}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB1FDC48-59DD-4853-AFDA-E26602C09153}.Release|Any CPU.Build.0 = Release|Any CPU - {BB1FDC48-59DD-4853-AFDA-E26602C09153}.Release|ARM.ActiveCfg = Release|Any CPU - {BB1FDC48-59DD-4853-AFDA-E26602C09153}.Release|ARM.Build.0 = Release|Any CPU - {BB1FDC48-59DD-4853-AFDA-E26602C09153}.Release|x64.ActiveCfg = Release|Any CPU - {BB1FDC48-59DD-4853-AFDA-E26602C09153}.Release|x64.Build.0 = Release|Any CPU - {BB1FDC48-59DD-4853-AFDA-E26602C09153}.Release|x86.ActiveCfg = Release|Any CPU - {BB1FDC48-59DD-4853-AFDA-E26602C09153}.Release|x86.Build.0 = Release|Any CPU - {B9BCD96F-8C6F-4F86-A1FA-36D2629EFE9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B9BCD96F-8C6F-4F86-A1FA-36D2629EFE9E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B9BCD96F-8C6F-4F86-A1FA-36D2629EFE9E}.Debug|ARM.ActiveCfg = Debug|Any CPU - {B9BCD96F-8C6F-4F86-A1FA-36D2629EFE9E}.Debug|ARM.Build.0 = Debug|Any CPU - {B9BCD96F-8C6F-4F86-A1FA-36D2629EFE9E}.Debug|x64.ActiveCfg = Debug|Any CPU - {B9BCD96F-8C6F-4F86-A1FA-36D2629EFE9E}.Debug|x64.Build.0 = Debug|Any CPU - {B9BCD96F-8C6F-4F86-A1FA-36D2629EFE9E}.Debug|x86.ActiveCfg = Debug|Any CPU - {B9BCD96F-8C6F-4F86-A1FA-36D2629EFE9E}.Debug|x86.Build.0 = Debug|Any CPU - {B9BCD96F-8C6F-4F86-A1FA-36D2629EFE9E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B9BCD96F-8C6F-4F86-A1FA-36D2629EFE9E}.Release|Any CPU.Build.0 = Release|Any CPU - {B9BCD96F-8C6F-4F86-A1FA-36D2629EFE9E}.Release|ARM.ActiveCfg = Release|Any CPU - {B9BCD96F-8C6F-4F86-A1FA-36D2629EFE9E}.Release|ARM.Build.0 = Release|Any CPU - {B9BCD96F-8C6F-4F86-A1FA-36D2629EFE9E}.Release|x64.ActiveCfg = Release|Any CPU - {B9BCD96F-8C6F-4F86-A1FA-36D2629EFE9E}.Release|x64.Build.0 = Release|Any CPU - {B9BCD96F-8C6F-4F86-A1FA-36D2629EFE9E}.Release|x86.ActiveCfg = Release|Any CPU - {B9BCD96F-8C6F-4F86-A1FA-36D2629EFE9E}.Release|x86.Build.0 = Release|Any CPU {A55DD800-321B-44C2-A26E-D1CE375FB325}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A55DD800-321B-44C2-A26E-D1CE375FB325}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A55DD800-321B-44C2-A26E-D1CE375FB325}.Debug|ARM.ActiveCfg = Debug|Any CPU - {A55DD800-321B-44C2-A26E-D1CE375FB325}.Debug|ARM.Build.0 = Debug|Any CPU - {A55DD800-321B-44C2-A26E-D1CE375FB325}.Debug|x64.ActiveCfg = Debug|Any CPU - {A55DD800-321B-44C2-A26E-D1CE375FB325}.Debug|x64.Build.0 = Debug|Any CPU - {A55DD800-321B-44C2-A26E-D1CE375FB325}.Debug|x86.ActiveCfg = Debug|Any CPU - {A55DD800-321B-44C2-A26E-D1CE375FB325}.Debug|x86.Build.0 = Debug|Any CPU {A55DD800-321B-44C2-A26E-D1CE375FB325}.Release|Any CPU.ActiveCfg = Release|Any CPU {A55DD800-321B-44C2-A26E-D1CE375FB325}.Release|Any CPU.Build.0 = Release|Any CPU - {A55DD800-321B-44C2-A26E-D1CE375FB325}.Release|ARM.ActiveCfg = Release|Any CPU - {A55DD800-321B-44C2-A26E-D1CE375FB325}.Release|ARM.Build.0 = Release|Any CPU - {A55DD800-321B-44C2-A26E-D1CE375FB325}.Release|x64.ActiveCfg = Release|Any CPU - {A55DD800-321B-44C2-A26E-D1CE375FB325}.Release|x64.Build.0 = Release|Any CPU - {A55DD800-321B-44C2-A26E-D1CE375FB325}.Release|x86.ActiveCfg = Release|Any CPU - {A55DD800-321B-44C2-A26E-D1CE375FB325}.Release|x86.Build.0 = Release|Any CPU {BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8}.Debug|ARM.ActiveCfg = Debug|Any CPU - {BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8}.Debug|ARM.Build.0 = Debug|Any CPU - {BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8}.Debug|x64.ActiveCfg = Debug|Any CPU - {BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8}.Debug|x64.Build.0 = Debug|Any CPU - {BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8}.Debug|x86.ActiveCfg = Debug|Any CPU - {BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8}.Debug|x86.Build.0 = Debug|Any CPU {BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8}.Release|Any CPU.ActiveCfg = Release|Any CPU {BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8}.Release|Any CPU.Build.0 = Release|Any CPU - {BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8}.Release|ARM.ActiveCfg = Release|Any CPU - {BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8}.Release|ARM.Build.0 = Release|Any CPU - {BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8}.Release|x64.ActiveCfg = Release|Any CPU - {BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8}.Release|x64.Build.0 = Release|Any CPU - {BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8}.Release|x86.ActiveCfg = Release|Any CPU - {BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8}.Release|x86.Build.0 = Release|Any CPU {A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5}.Debug|ARM.ActiveCfg = Debug|Any CPU - {A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5}.Debug|ARM.Build.0 = Debug|Any CPU - {A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5}.Debug|x64.ActiveCfg = Debug|Any CPU - {A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5}.Debug|x64.Build.0 = Debug|Any CPU - {A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5}.Debug|x86.ActiveCfg = Debug|Any CPU - {A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5}.Debug|x86.Build.0 = Debug|Any CPU {A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5}.Release|Any CPU.ActiveCfg = Release|Any CPU {A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5}.Release|Any CPU.Build.0 = Release|Any CPU - {A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5}.Release|ARM.ActiveCfg = Release|Any CPU - {A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5}.Release|ARM.Build.0 = Release|Any CPU - {A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5}.Release|x64.ActiveCfg = Release|Any CPU - {A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5}.Release|x64.Build.0 = Release|Any CPU - {A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5}.Release|x86.ActiveCfg = Release|Any CPU - {A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5}.Release|x86.Build.0 = Release|Any CPU + {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EC2F5376-3078-412C-9EF6-3F4167B08F2B}.Release|Any CPU.Build.0 = Release|Any CPU + {43FA3F95-0516-4D66-938E-266C0F961C79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {43FA3F95-0516-4D66-938E-266C0F961C79}.Debug|Any CPU.Build.0 = Debug|Any CPU + {43FA3F95-0516-4D66-938E-266C0F961C79}.Release|Any CPU.ActiveCfg = Release|Any CPU + {43FA3F95-0516-4D66-938E-266C0F961C79}.Release|Any CPU.Build.0 = Release|Any CPU + {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F2A6877B-7452-432A-8E6C-0B809FCCE860}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {8BF2C711-7979-40D0-AE9D-A4F57340C50E} = {937D9058-D53A-4341-B076-284442EADE2D} - {5FE37D04-9941-449E-9376-4C7BCA579F8B} = {937D9058-D53A-4341-B076-284442EADE2D} - {20ECB16C-D7E6-41CA-A8ED-3C197057ECCD} = {856D08A7-0AE3-42C1-A811-75B59C0045BE} {50BEB203-FEA0-47FD-9BC1-4B2ECCC91377} = {856D08A7-0AE3-42C1-A811-75B59C0045BE} {059A19FD-88D2-4BF4-B0E2-19192C954EA4} = {C3F93254-98AD-40BD-89C4-AFF840BF2C37} - {C76FC002-10FD-4A69-AF1A-1C9260EC6807} = {059A19FD-88D2-4BF4-B0E2-19192C954EA4} {44C47FC7-E690-4FCE-839A-95CA28CE51B6} = {059A19FD-88D2-4BF4-B0E2-19192C954EA4} - {B902824A-989D-44A3-A93E-FFBD8C531154} = {D7A50A64-07B3-4325-B814-294CE6390293} - {D2687546-4D86-4E58-90CA-C606EE9F4E16} = {D7A50A64-07B3-4325-B814-294CE6390293} - {D17D76EA-69C0-4EC1-8E35-D15C4EB3F4B0} = {B902824A-989D-44A3-A93E-FFBD8C531154} - {EC2F5376-3078-412C-9EF6-3F4167B08F2B} = {B902824A-989D-44A3-A93E-FFBD8C531154} - {28DA6C7F-A14D-4787-9D61-457997288D99} = {D2687546-4D86-4E58-90CA-C606EE9F4E16} - {43FA3F95-0516-4D66-938E-266C0F961C79} = {D2687546-4D86-4E58-90CA-C606EE9F4E16} - {F2A6877B-7452-432A-8E6C-0B809FCCE860} = {22D31767-F452-4B97-891A-2B5FDBBC0513} - {ABB72FFC-C11C-493C-865A-2F13009C1937} = {22D31767-F452-4B97-891A-2B5FDBBC0513} {E0C19E77-50A6-4FC9-96F2-B6FBA588A9B3} = {C3F93254-98AD-40BD-89C4-AFF840BF2C37} {C9FD840A-D479-41AF-A271-5023AF4A03ED} = {E0C19E77-50A6-4FC9-96F2-B6FBA588A9B3} - {689483C1-2635-4F53-BF30-B2080164284F} = {856D08A7-0AE3-42C1-A811-75B59C0045BE} - {B1AFA554-1949-4269-B9AD-E90452102FB7} = {B902824A-989D-44A3-A93E-FFBD8C531154} - {BB1FDC48-59DD-4853-AFDA-E26602C09153} = {D2687546-4D86-4E58-90CA-C606EE9F4E16} - {B9BCD96F-8C6F-4F86-A1FA-36D2629EFE9E} = {059A19FD-88D2-4BF4-B0E2-19192C954EA4} {A55DD800-321B-44C2-A26E-D1CE375FB325} = {BDE74344-ADEE-424F-AF06-BB37D2D493B5} {BD56CDCE-25A2-4E82-BB5E-F9AB25F2E6E8} = {BDE74344-ADEE-424F-AF06-BB37D2D493B5} {A9BBFC2F-29D2-4003-AFE2-B7346F8F3DA5} = {BDE74344-ADEE-424F-AF06-BB37D2D493B5} + {B902824A-989D-44A3-A93E-FFBD8C531154} = {D7A50A64-07B3-4325-B814-294CE6390293} + {EC2F5376-3078-412C-9EF6-3F4167B08F2B} = {B902824A-989D-44A3-A93E-FFBD8C531154} + {D2687546-4D86-4E58-90CA-C606EE9F4E16} = {D7A50A64-07B3-4325-B814-294CE6390293} + {43FA3F95-0516-4D66-938E-266C0F961C79} = {D2687546-4D86-4E58-90CA-C606EE9F4E16} + {F2A6877B-7452-432A-8E6C-0B809FCCE860} = {22D31767-F452-4B97-891A-2B5FDBBC0513} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A8810D42-17AC-46D1-92C9-2E1BDA3FF99D} - EndGlobalSection - GlobalSection(SharedMSBuildProjectFiles) = preSolution - src\Main\Cfg.Net.Shared\Cfg.Net.Shared.projitems*{20ecb16c-d7e6-41ca-a8ed-3c197057eccd}*SharedItemsImports = 13 - src\Customizers\Shorthand\Cfg.Net.Shorthand.Shared\Cfg.Net.Shorthand.Shared.projitems*{28da6c7f-a14d-4787-9d61-457997288d99}*SharedItemsImports = 13 - src\Customizers\Shorthand\Cfg.Net.Shorthand.Shared\Cfg.Net.Shorthand.Shared.projitems*{43fa3f95-0516-4d66-938e-266c0f961c79}*SharedItemsImports = 5 - src\Readers\Default\Cfg.Net.Reader.Shared\Cfg.Net.Reader.Shared.projitems*{44c47fc7-e690-4fce-839a-95ca28ce51b6}*SharedItemsImports = 5 - src\Main\Cfg.Net.Shared\Cfg.Net.Shared.projitems*{50beb203-fea0-47fd-9bc1-4b2eccc91377}*SharedItemsImports = 5 - src\Main\Cfg.Net.Shared\Cfg.Net.Shared.projitems*{689483c1-2635-4f53-bf30-b2080164284f}*SharedItemsImports = 5 - Testing\TestShared\TestShared.projitems*{abb72ffc-c11c-493c-865a-2f13009c1937}*SharedItemsImports = 13 - src\Customizers\Environment\Cfg.Net.Environment.Shared\Cfg.Net.Environment.Shared.projitems*{b1afa554-1949-4269-b9ad-e90452102fb7}*SharedItemsImports = 5 - src\Readers\Default\Cfg.Net.Reader.Shared\Cfg.Net.Reader.Shared.projitems*{b9bcd96f-8c6f-4f86-a1fa-36d2629efe9e}*SharedItemsImports = 5 - src\Customizers\Shorthand\Cfg.Net.Shorthand.Shared\Cfg.Net.Shorthand.Shared.projitems*{bb1fdc48-59dd-4853-afda-e26602c09153}*SharedItemsImports = 5 - src\Readers\Default\Cfg.Net.Reader.Shared\Cfg.Net.Reader.Shared.projitems*{c76fc002-10fd-4a69-af1a-1c9260ec6807}*SharedItemsImports = 13 - src\Customizers\Environment\Cfg.Net.Environment.Shared\Cfg.Net.Environment.Shared.projitems*{d17d76ea-69c0-4ec1-8e35-d15c4eb3f4b0}*SharedItemsImports = 13 - src\Customizers\Environment\Cfg.Net.Environment.Shared\Cfg.Net.Environment.Shared.projitems*{ec2f5376-3078-412c-9ef6-3f4167b08f2b}*SharedItemsImports = 5 - Testing\TestShared\TestShared.projitems*{f2a6877b-7452-432a-8e6c-0b809fcce860}*SharedItemsImports = 5 + SolutionGuid = {35C52E1A-B015-433B-9A31-19B0FE0E2038} EndGlobalSection EndGlobal diff --git a/Cfg.Net.sln.DotSettings b/Cfg.Net.sln.DotSettings index 08387e4..c3b8ecd 100644 --- a/Cfg.Net.sln.DotSettings +++ b/Cfg.Net.sln.DotSettings @@ -1,7 +1,7 @@  $SOLUTION$ An Alternative .NET Configuration Handler -Copyright 2015-2019 Dale Newman +Copyright 2015-2026 Dale Newman Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/Nuget/Cfg.Net.Environment.nuspec b/Nuget/Cfg.Net.Environment.nuspec deleted file mode 100644 index 5deedda..0000000 --- a/Nuget/Cfg.Net.Environment.nuspec +++ /dev/null @@ -1,34 +0,0 @@ - - - - Cfg-NET.Environment - 0.15.0-beta - Cfg-NET Environment - Dale Newman - Dale Newman - Apache-2.0 - https://github.com/dalenewman/Cfg-NET - false - allow manipulation from the outside via paramenters, environments, and place-holders - general maintenance - Copyright 2015-2022 - configuration, settings, cfgnet - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Nuget/Cfg.Net.Parser.Json.Net.nuspec b/Nuget/Cfg.Net.Parser.Json.Net.nuspec deleted file mode 100644 index f41b6d7..0000000 --- a/Nuget/Cfg.Net.Parser.Json.Net.nuspec +++ /dev/null @@ -1,28 +0,0 @@ - - - - Cfg-NET.Parser.Json.Net - 0.15.0-beta - Cfg-NET Json.Net Parser - Dale Newman - Dale Newman - Apache-2.0 - https://github.com/dalenewman/Cfg-NET - false - A parser implemented in xml linq - updates and nuget - Copyright 2015-2022 - configuration, settings, cfgnet, xml, linq - - - - - - - - - - - - - diff --git a/Nuget/Cfg.Net.Parser.Xml.Linq.nuspec b/Nuget/Cfg.Net.Parser.Xml.Linq.nuspec deleted file mode 100644 index 468425a..0000000 --- a/Nuget/Cfg.Net.Parser.Xml.Linq.nuspec +++ /dev/null @@ -1,27 +0,0 @@ - - - - Cfg-NET.Parser.Xml.Linq - 0.15.0-beta - Cfg-NET Xml.Linq Parser - Dale Newman - Dale Newman - Apache-2.0 - https://github.com/dalenewman/Cfg-NET - false - A parser implemented in xml linq - updates and nuget - Copyright 2015-2022 - configuration, settings, cfgnet, xml, linq - - - - - - - - - - - - diff --git a/Nuget/Cfg.Net.Parser.YamlDotNet.nuspec b/Nuget/Cfg.Net.Parser.YamlDotNet.nuspec deleted file mode 100644 index 4a2f9fa..0000000 --- a/Nuget/Cfg.Net.Parser.YamlDotNet.nuspec +++ /dev/null @@ -1,28 +0,0 @@ - - - - Cfg-NET.Parser.YamlDotNet - 0.15.0-beta - Cfg-NET YamlDotNet Parser - Dale Newman - Dale Newman - Apache-2.0 - https://github.com/dalenewman/Cfg-NET - false - A parser implemented in yamldotnet - updates and nuget - Copyright 2015-2022 - configuration, settings, cfgnet, yaml, yamldotnet - - - - - - - - - - - - - diff --git a/Nuget/Cfg.Net.Reader.nuspec b/Nuget/Cfg.Net.Reader.nuspec deleted file mode 100644 index 4c06a9d..0000000 --- a/Nuget/Cfg.Net.Reader.nuspec +++ /dev/null @@ -1,35 +0,0 @@ - - - - Cfg-NET.Reader - 0.15.0-beta - Cfg-NET Reader - Dale Newman - Dale Newman - Apache-2.0 - https://github.com/dalenewman/Cfg-NET - false - A reader implementation - general maintenance - Copyright 2015-2022 - configuration, settings, cfgnet - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Nuget/Cfg.Net.Readers.FileSystemWatcherReader.nuspec b/Nuget/Cfg.Net.Readers.FileSystemWatcherReader.nuspec deleted file mode 100644 index 07610c9..0000000 --- a/Nuget/Cfg.Net.Readers.FileSystemWatcherReader.nuspec +++ /dev/null @@ -1,27 +0,0 @@ - - - - Cfg-NET.Readers.FileSystemWatcherReader - 0.15.0-beta - Cfg-NET File System Watcher Reader - Dale Newman - Dale Newman - Apache-2.0 - https://github.com/dalenewman/Cfg-NET - false - A file reader implementation that re-loads when the file changes - general maintenance - Copyright 2015-2022 - configuration, settings - - - - - - - - - - - - \ No newline at end of file diff --git a/Nuget/Cfg.Net.Shorthand.nuspec b/Nuget/Cfg.Net.Shorthand.nuspec deleted file mode 100644 index b1f906d..0000000 --- a/Nuget/Cfg.Net.Shorthand.nuspec +++ /dev/null @@ -1,35 +0,0 @@ - - - - Cfg-NET.Shorthand - 0.15.0-beta - Cfg-NET Shorthand - Dale Newman - Dale Newman - Apache-2.0 - https://github.com/dalenewman/Cfg-NET - false - A way to write more configuration with less typing - general maintenance - Copyright 2015-2022 - configuration, settings, cfgnet - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Nuget/Cfg.Net.nuspec b/Nuget/Cfg.Net.nuspec deleted file mode 100644 index 316e51d..0000000 --- a/Nuget/Cfg.Net.nuspec +++ /dev/null @@ -1,31 +0,0 @@ - - - - Cfg-NET - 0.15.0-beta - Cfg-NET - Dale Newman - Dale Newman - Apache-2.0 - https://github.com/dalenewman/Cfg-NET - false - .net configuration handler - general maintenance - Copyright 2015-2022 - configuration, settings, xml, json, cfgnet - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Nuget/myget.bat b/Nuget/myget.bat deleted file mode 100644 index 4a28b48..0000000 --- a/Nuget/myget.bat +++ /dev/null @@ -1,19 +0,0 @@ -nuget.exe pack Cfg.Net.nuspec -OutputDirectory "c:\temp\modules" -nuget.exe pack Cfg.Net.Environment.nuspec -OutputDirectory "c:\temp\modules" -nuget.exe pack Cfg.Net.Reader.nuspec -OutputDirectory "c:\temp\modules" -nuget.exe pack Cfg.Net.Shorthand.nuspec -OutputDirectory "c:\temp\modules" -nuget.exe pack Cfg.Net.Readers.FileSystemWatcherReader.nuspec -OutputDirectory "c:\temp\modules" - -nuget.exe pack Cfg.Net.Parser.YamlDotNet.nuspec -OutputDirectory "c:\temp\modules" -nuget.exe pack Cfg.Net.Parser.Json.Net.nuspec -OutputDirectory "c:\temp\modules" -nuget.exe pack Cfg.Net.Parser.Xml.Linq.nuspec -OutputDirectory "c:\temp\modules" - -REM nuget.exe push "c:\temp\modules\Cfg-NET.0.15.0-beta.nupkg" -source https://www.myget.org/F/transformalize/api/v3/index.json -REM nuget.exe push "c:\temp\modules\Cfg-NET.Reader.0.15.0-beta.nupkg" -source https://www.myget.org/F/transformalize/api/v3/index.json -REM nuget.exe push "c:\temp\modules\Cfg-NET.Environment.0.15.0-beta.nupkg" -source https://www.myget.org/F/transformalize/api/v3/index.json -REM nuget.exe push "c:\temp\modules\Cfg-NET.Shorthand.0.15.0-beta.nupkg" -source https://www.myget.org/F/transformalize/api/v3/index.json -REM nuget.exe push "c:\temp\modules\Cfg-NET.Readers.FileSystemWatcherReader.0.15.0-beta.nupkg" -source https://www.myget.org/F/transformalize/api/v3/index.json - -nuget.exe push "c:\temp\modules\Cfg-NET.Parser.YamlDotNet.0.15.0-beta.nupkg" -source https://www.myget.org/F/transformalize/api/v3/index.json -nuget.exe push "c:\temp\modules\Cfg-NET.Parser.Json.Net.0.15.0-beta.nupkg" -source https://www.myget.org/F/transformalize/api/v3/index.json -nuget.exe push "c:\temp\modules\Cfg-NET.Parser.Xml.Linq.0.15.0-beta.nupkg" -source https://www.myget.org/F/transformalize/api/v3/index.json diff --git a/Nuget/nuget.bat b/Nuget/nuget.bat deleted file mode 100644 index c69efbf..0000000 --- a/Nuget/nuget.bat +++ /dev/null @@ -1,11 +0,0 @@ -REM nuget.exe pack Cfg.Net.nuspec -OutputDirectory "c:\temp\modules" -REM nuget.exe pack Cfg.Net.Environment.nuspec -OutputDirectory "c:\temp\modules" -REM nuget.exe pack Cfg.Net.Reader.nuspec -OutputDirectory "c:\temp\modules" -REM nuget.exe pack Cfg.Net.Shorthand.nuspec -OutputDirectory "c:\temp\modules" -REM nuget.exe pack Cfg.Net.Readers.FileSystemWatcherReader.nuspec -OutputDirectory "c:\temp\modules" - -nuget.exe push "c:\temp\modules\Cfg-NET.0.15.0-beta.nupkg" -source https://api.nuget.org/v3/index.json -nuget.exe push "c:\temp\modules\Cfg-NET.Reader.0.15.0-beta.nupkg" -source https://api.nuget.org/v3/index.json -nuget.exe push "c:\temp\modules\Cfg-NET.Environment.0.15.0-beta.nupkg" -source https://api.nuget.org/v3/index.json -nuget.exe push "c:\temp\modules\Cfg-NET.Shorthand.0.15.0-beta.nupkg" -source https://api.nuget.org/v3/index.json -nuget.exe push "c:\temp\modules\Cfg-NET.Readers.FileSystemWatcherReader.0.15.0-beta.nupkg" -source https://api.nuget.org/v3/index.json diff --git a/Nuget/nuget.exe b/Nuget/nuget.exe deleted file mode 100644 index 0f83b17..0000000 Binary files a/Nuget/nuget.exe and /dev/null differ diff --git a/README.md b/README.md index 9e2cdb0..0511adf 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ Cfg-NET ======= -[![Build status](https://ci.appveyor.com/api/projects/status/qm4auhkcv6b23abr?svg=true)](https://ci.appveyor.com/project/dalenewman/cfg-net) [![NuGet](https://img.shields.io/nuget/v/Cfg-NET.svg?label=Nuget)](https://www.nuget.org/packages/Cfg-NET) Cfg-NET is a configuration library for .NET with @@ -397,6 +396,6 @@ I appreciate the stars and feedback. #### Further Reading (optional) -* [Using Dependency Injection & Autofac with Cfg-NET](https://github.com/dalenewman/Cfg-NET/blob/master/Articles/Autofac.md) -* [Using Environments, Parameters, and @(Place-Holders)](https://github.com/dalenewman/Cfg-NET/blob/master/Articles/EnvironmentsAndParameters.md) -* [Using Shorthand](https://github.com/dalenewman/Cfg-NET/blob/master/Articles/Shorthand.md) +* [Using Dependency Injection & Autofac with Cfg-NET](https://github.com/dalenewman/Cfg-NET/blob/master/docs/autofac.md) +* [Using Environments, Parameters, and @(Place-Holders)](https://github.com/dalenewman/Cfg-NET/blob/master/docs/environments-and-parameters.md) +* [Using Shorthand](https://github.com/dalenewman/Cfg-NET/blob/master/docs/shorthand.md) diff --git a/Testing/TestFramework/DifferentJsonParser.cs b/Testing/TestFramework/DifferentJsonParser.cs deleted file mode 100644 index 9a4e4a6..0000000 --- a/Testing/TestFramework/DifferentJsonParser.cs +++ /dev/null @@ -1,77 +0,0 @@ -// Cfg.Net -// An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -using System; -using System.Collections.Generic; -using System.Linq; -using Cfg.Net; -using Cfg.Net.Contracts; -using Cfg.Net.Parsers.Json.Net; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace UnitTest { - - [TestClass] - public class DifferentJsonParser { - - [TestMethod] - public void TestJson() { - var json = @" -{ - 'parameters' : [ - { 'name':'p1', 'value':true }, - { 'name':'p2', 'value':false } - ] -}".Replace("'", "\""); - - var cfg = new TestDifferentJsonParser(json, new JsonNetParser(), new JsonNetSerializer()); - - foreach (var problem in cfg.Errors()) { - Console.WriteLine(problem); - } - - var problems = cfg.Errors(); - Assert.AreEqual(0, problems.Length); - - Assert.AreEqual(true, cfg.Parameters.First().Value); - Assert.AreEqual(false, cfg.Parameters.Last().Value); - - var backToJson = cfg.Serialize(); - Assert.AreEqual("{\"parameters\":[{\"name\":\"p1\",\"value\":true,\"sequence\":1},{\"name\":\"p2\",\"value\":false,\"sequence\":2}],\"sequence\":0}", backToJson); - - } - - - class TestDifferentJsonParser : CfgNode { - [Cfg] - public List Parameters { get; set; } - - public TestDifferentJsonParser(string xml, params IDependency[] dependencies) : base(dependencies) { - Load(xml); - } - } - - class TestDifferentJsonParserParameter : CfgNode { - [Cfg(required = true, toLower = true)] - public string Name { get; set; } - - [Cfg(value = false)] - public bool Value { get; set; } - } - - } - -} diff --git a/Testing/TestFramework/DifferentXmlParser.cs b/Testing/TestFramework/DifferentXmlParser.cs deleted file mode 100644 index c799a8f..0000000 --- a/Testing/TestFramework/DifferentXmlParser.cs +++ /dev/null @@ -1,73 +0,0 @@ -// Cfg.Net -// An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -using System; -using System.Collections.Generic; -using System.Linq; -using Cfg.Net; -using Cfg.Net.Contracts; -using Cfg.Net.Parsers.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace UnitTest { - - [TestClass] - public class DifferentXmlParser { - - [TestMethod] - public void TestXml() { - var xml = @" - - - - - -".Replace("'", "\""); - - var cfg = new TestDifferentXmlParser(xml, new XDocumentParser()); - - foreach (var problem in cfg.Errors()) { - Console.WriteLine(problem); - } - - var problems = cfg.Errors(); - Assert.AreEqual(0, problems.Length); - - Assert.AreEqual(true, cfg.Parameters.First().Value); - Assert.AreEqual(false, cfg.Parameters.Last().Value); - - } - - } - - public sealed class TestDifferentXmlParser : CfgNode { - [Cfg] - public List Parameters { get; set; } - - public TestDifferentXmlParser(string xml, IParser parser) - : base(parser) { - Load(xml); - } - } - - public class TestDifferentXmlParserParameter : CfgNode { - [Cfg(required = true, toLower = true)] - public string Name { get; set; } - - [Cfg(value = false)] - public bool Value { get; private set; } - } -} diff --git a/Testing/TestFramework/Properties/AssemblyInfo.cs b/Testing/TestFramework/Properties/AssemblyInfo.cs deleted file mode 100644 index 2acef9f..0000000 --- a/Testing/TestFramework/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("TestFramework")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("TestFramework")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: ComVisible(false)] - -[assembly: Guid("b311157f-6ed1-4260-b236-422f50d93048")] - -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.15.0.0")] -[assembly: AssemblyFileVersion("0.15.0.0")] diff --git a/Testing/TestFramework/ReadMe.json b/Testing/TestFramework/ReadMe.json deleted file mode 100644 index 52f17eb..0000000 --- a/Testing/TestFramework/ReadMe.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "id": 1, - "servers": [ - { - "name": "Gandalf", - "databases": [ - { - "name": "master", - "backupsToKeep": 6 - } - ] - }, - { - "name": "Saruman", - "databases": [ - { - "name": "master", - "backupFolder": "\\\\san\\sql-backups\\saruman\\master", - "backupsToKeep": 8 - }, - { - "name": "model", - "backupFolder": "\\\\san\\sql-backups\\saruman\\model" - } - ] - } - ] -} diff --git a/Testing/TestFramework/ReadMe.xml b/Testing/TestFramework/ReadMe.xml deleted file mode 100644 index 3ca9513..0000000 --- a/Testing/TestFramework/ReadMe.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/Testing/TestFramework/ReadMe2.xml b/Testing/TestFramework/ReadMe2.xml deleted file mode 100644 index a0a54cc..0000000 --- a/Testing/TestFramework/ReadMe2.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Testing/TestFramework/TestFramework.csproj b/Testing/TestFramework/TestFramework.csproj deleted file mode 100644 index a13f761..0000000 --- a/Testing/TestFramework/TestFramework.csproj +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - Debug - AnyCPU - {B311157F-6ED1-4260-B236-422F50D93048} - Library - Properties - TestFramework - TestFramework - v4.6.2 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 15.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - - true - full - false - bin\Debug\ - TRACE;DEBUG;FRAMEWORK - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE;FRAMEWORK - prompt - 4 - - - - ..\..\packages\MSTest.TestFramework.2.2.10\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - - - ..\..\packages\MSTest.TestFramework.2.2.10\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll - - - - - - - ..\..\packages\YamlDotNet.12.0.0\lib\net45\YamlDotNet.dll - - - - - - - - - - - - Always - - - - - {ec2f5376-3078-412c-9ef6-3f4167b08f2b} - Cfg.Net.Environment.Standard.20 - - - {43fa3f95-0516-4d66-938e-266c0f961c79} - Cfg.Net.Shorthand.Standard.20 - - - {50beb203-fea0-47fd-9bc1-4b2eccc91377} - Cfg.Net.Standard.20 - - - {d64515c8-95b0-459b-bf6c-9f54e170211f} - Cfg.Net.Parsers.Json.Net - - - {093898fa-64e6-4e71-8dff-141c8888bfbe} - Cfg.Net.Parsers.Xml.Linq - - - {2008644b-db1f-4a50-bb7e-550f55e704f0} - Cfg.Net.Parsers.YamlDotNet - - - {44c47fc7-e690-4fce-839a-95ca28ce51b6} - Cfg.Net.Reader.Standard.20 - - - {c9fd840a-d479-41af-a271-5023af4a03ed} - FileSystemWatcherReader.Standard.20 - - - - - Always - - - Always - - - Always - - - - - - - - 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}. - - - - - - \ No newline at end of file diff --git a/Testing/TestFramework/YamlDotNet.cs b/Testing/TestFramework/YamlDotNet.cs deleted file mode 100644 index 006288b..0000000 --- a/Testing/TestFramework/YamlDotNet.cs +++ /dev/null @@ -1,90 +0,0 @@ -// Cfg.Net -// An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -using System; -using System.Collections.Generic; -using System.Linq; -using Cfg.Net; -using Cfg.Net.Contracts; -using Cfg.Net.Parsers.YamlDotNet; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using YamlDotNet.Serialization; -using YamlDotNet.Serialization.NamingConventions; - -namespace UnitTest { - - [TestClass] - public class YamlDotNet { - - [TestMethod] - public void TestYaml() { - const string yaml = @"parameters: - - name: p1 - value: true - - name: p2 - value: false -"; - var builder = new SerializerBuilder(); - // builder.EmitDefaults(); - builder.ConfigureDefaultValuesHandling(DefaultValuesHandling.Preserve); - builder.WithNamingConvention(new HyphenatedNamingConvention()); - - var cfg = new TestYamlParser(yaml, new YamlDotNetParser(), new YamlDotNetSerializer(builder.Build())); - - foreach (var problem in cfg.Errors()) { - Console.WriteLine(problem); - } - - var problems = cfg.Errors(); - Assert.AreEqual(0, problems.Length); - - Assert.AreEqual(true, cfg.Parameters.First().Value); - Assert.AreEqual(false, cfg.Parameters.Last().Value); - - var backToYaml = cfg.Serialize(); - Assert.AreEqual(@"parameters: -- name: p1 - value: true - sequence: 1 -- name: p2 - value: false - sequence: 2 -sequence: 0 -".Replace("\r\n", "\n"), backToYaml.Replace("\r\n", "\n")); - - } - - - class TestYamlParser : CfgNode { - [Cfg] - public List Parameters { get; set; } - - public TestYamlParser(string yaml, params IDependency[] dependencies) : base(dependencies) { - Load(yaml); - } - } - - class TestYamlParserParameter : CfgNode { - [Cfg(required = true, toLower = true)] - public string Name { get; set; } - - [Cfg(value = false)] - public bool Value { get; set; } - } - - } - -} diff --git a/Testing/TestFramework/packages.config b/Testing/TestFramework/packages.config deleted file mode 100644 index 780064d..0000000 --- a/Testing/TestFramework/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Testing/TestFramework/shorthand.xml b/Testing/TestFramework/shorthand.xml deleted file mode 100644 index 5834c52..0000000 --- a/Testing/TestFramework/shorthand.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Testing/TestShared/Case.cs b/Testing/TestNetCore/Case.cs similarity index 98% rename from Testing/TestShared/Case.cs rename to Testing/TestNetCore/Case.cs index 59ab8e1..18f11e7 100644 --- a/Testing/TestShared/Case.cs +++ b/Testing/TestNetCore/Case.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/Clone.cs b/Testing/TestNetCore/Clone.cs similarity index 98% rename from Testing/TestShared/Clone.cs rename to Testing/TestNetCore/Clone.cs index 9fa240a..e5ca637 100644 --- a/Testing/TestShared/Clone.cs +++ b/Testing/TestNetCore/Clone.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/ConfigureWithCode.cs b/Testing/TestNetCore/ConfigureWithCode.cs similarity index 98% rename from Testing/TestShared/ConfigureWithCode.cs rename to Testing/TestNetCore/ConfigureWithCode.cs index a6bcac6..b0b8478 100644 --- a/Testing/TestShared/ConfigureWithCode.cs +++ b/Testing/TestNetCore/ConfigureWithCode.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/CustomProblems.cs b/Testing/TestNetCore/CustomProblems.cs similarity index 99% rename from Testing/TestShared/CustomProblems.cs rename to Testing/TestNetCore/CustomProblems.cs index 0a43aa7..e84e713 100644 --- a/Testing/TestShared/CustomProblems.cs +++ b/Testing/TestNetCore/CustomProblems.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/DifferentJsonParser.cs b/Testing/TestNetCore/DifferentJsonParser.cs similarity index 93% rename from Testing/TestShared/DifferentJsonParser.cs rename to Testing/TestNetCore/DifferentJsonParser.cs index 9a4e4a6..4d3cf23 100644 --- a/Testing/TestShared/DifferentJsonParser.cs +++ b/Testing/TestNetCore/DifferentJsonParser.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,8 +19,9 @@ using System.Linq; using Cfg.Net; using Cfg.Net.Contracts; -using Cfg.Net.Parsers.Json.Net; +using Cfg.Net.Parsers.Json; using Microsoft.VisualStudio.TestTools.UnitTesting; +using JsonSerializer = Cfg.Net.Parsers.Json.JsonSerializer; namespace UnitTest { @@ -37,7 +38,7 @@ public void TestJson() { ] }".Replace("'", "\""); - var cfg = new TestDifferentJsonParser(json, new JsonNetParser(), new JsonNetSerializer()); + var cfg = new TestDifferentJsonParser(json, new JsonParser(), new JsonSerializer()); foreach (var problem in cfg.Errors()) { Console.WriteLine(problem); diff --git a/Testing/TestShared/DifferentXmlParser.cs b/Testing/TestNetCore/DifferentXmlParser.cs similarity index 98% rename from Testing/TestShared/DifferentXmlParser.cs rename to Testing/TestNetCore/DifferentXmlParser.cs index c799a8f..81eb2fb 100644 --- a/Testing/TestShared/DifferentXmlParser.cs +++ b/Testing/TestNetCore/DifferentXmlParser.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/Domain.cs b/Testing/TestNetCore/Domain.cs similarity index 99% rename from Testing/TestShared/Domain.cs rename to Testing/TestNetCore/Domain.cs index 988fe77..8ce385b 100644 --- a/Testing/TestShared/Domain.cs +++ b/Testing/TestNetCore/Domain.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/ElementNameVariations.cs b/Testing/TestNetCore/ElementNameVariations.cs similarity index 99% rename from Testing/TestShared/ElementNameVariations.cs rename to Testing/TestNetCore/ElementNameVariations.cs index a8986d9..5cddd49 100644 --- a/Testing/TestShared/ElementNameVariations.cs +++ b/Testing/TestNetCore/ElementNameVariations.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/EmptyLists.cs b/Testing/TestNetCore/EmptyLists.cs similarity index 99% rename from Testing/TestShared/EmptyLists.cs rename to Testing/TestNetCore/EmptyLists.cs index 45d2025..b22f481 100644 --- a/Testing/TestShared/EmptyLists.cs +++ b/Testing/TestNetCore/EmptyLists.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/EnvironmentParameters.cs b/Testing/TestNetCore/EnvironmentParameters.cs similarity index 99% rename from Testing/TestShared/EnvironmentParameters.cs rename to Testing/TestNetCore/EnvironmentParameters.cs index cd525ac..7d42e90 100644 --- a/Testing/TestShared/EnvironmentParameters.cs +++ b/Testing/TestNetCore/EnvironmentParameters.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/FileWatcher.cs b/Testing/TestNetCore/FileWatcher.cs similarity index 98% rename from Testing/TestShared/FileWatcher.cs rename to Testing/TestNetCore/FileWatcher.cs index e985a16..322960d 100644 --- a/Testing/TestShared/FileWatcher.cs +++ b/Testing/TestNetCore/FileWatcher.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2019 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/FixIssue2.cs b/Testing/TestNetCore/FixIssue2.cs similarity index 97% rename from Testing/TestShared/FixIssue2.cs rename to Testing/TestNetCore/FixIssue2.cs index 157f112..6eb21f4 100644 --- a/Testing/TestShared/FixIssue2.cs +++ b/Testing/TestNetCore/FixIssue2.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/FreeFormData.cs b/Testing/TestNetCore/FreeFormData.cs similarity index 98% rename from Testing/TestShared/FreeFormData.cs rename to Testing/TestNetCore/FreeFormData.cs index a9a8092..9233b6f 100644 --- a/Testing/TestShared/FreeFormData.cs +++ b/Testing/TestNetCore/FreeFormData.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/Length.cs b/Testing/TestNetCore/Length.cs similarity index 98% rename from Testing/TestShared/Length.cs rename to Testing/TestNetCore/Length.cs index 5aa90fd..c885255 100644 --- a/Testing/TestShared/Length.cs +++ b/Testing/TestNetCore/Length.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/Main.cs b/Testing/TestNetCore/Main.cs similarity index 97% rename from Testing/TestShared/Main.cs rename to Testing/TestNetCore/Main.cs index 9fcd34e..f46b179 100644 --- a/Testing/TestShared/Main.cs +++ b/Testing/TestNetCore/Main.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -174,7 +174,7 @@ public void TestMultipleSites() { } Assert.AreEqual(2, problems.Length); - Assert.AreEqual("Could not set numeric to x inside sites item. Input string was not in a correct format.", problems[0]); + StringAssert.StartsWith(problems[0], "Could not set numeric to x inside sites item."); Assert.AreEqual("Duplicate name value github in sites.", problems[1]); Assert.AreEqual(4, cfg.Sites.Count); diff --git a/Testing/TestShared/ModifierTest.cs b/Testing/TestNetCore/ModifierTest.cs similarity index 98% rename from Testing/TestShared/ModifierTest.cs rename to Testing/TestNetCore/ModifierTest.cs index fbd4dcd..ef8d50e 100644 --- a/Testing/TestShared/ModifierTest.cs +++ b/Testing/TestNetCore/ModifierTest.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/Parameters.cs b/Testing/TestNetCore/Parameters.cs similarity index 99% rename from Testing/TestShared/Parameters.cs rename to Testing/TestNetCore/Parameters.cs index 8c90b30..5678372 100644 --- a/Testing/TestShared/Parameters.cs +++ b/Testing/TestNetCore/Parameters.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/PassInLogger.cs b/Testing/TestNetCore/PassInLogger.cs similarity index 98% rename from Testing/TestShared/PassInLogger.cs rename to Testing/TestNetCore/PassInLogger.cs index b5ca846..cf91967 100644 --- a/Testing/TestShared/PassInLogger.cs +++ b/Testing/TestNetCore/PassInLogger.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/PreValidateTest.cs b/Testing/TestNetCore/PreValidateTest.cs similarity index 98% rename from Testing/TestShared/PreValidateTest.cs rename to Testing/TestNetCore/PreValidateTest.cs index 9a2eee1..410ab9a 100644 --- a/Testing/TestShared/PreValidateTest.cs +++ b/Testing/TestNetCore/PreValidateTest.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/PropertyManipulation.cs b/Testing/TestNetCore/PropertyManipulation.cs similarity index 98% rename from Testing/TestShared/PropertyManipulation.cs rename to Testing/TestNetCore/PropertyManipulation.cs index 2bca3eb..b871a63 100644 --- a/Testing/TestShared/PropertyManipulation.cs +++ b/Testing/TestNetCore/PropertyManipulation.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/QueryStringTest.cs b/Testing/TestNetCore/QueryStringTest.cs similarity index 99% rename from Testing/TestShared/QueryStringTest.cs rename to Testing/TestNetCore/QueryStringTest.cs index 0a77534..b5597a8 100644 --- a/Testing/TestShared/QueryStringTest.cs +++ b/Testing/TestNetCore/QueryStringTest.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/ReadMe.cs b/Testing/TestNetCore/ReadMe.cs similarity index 99% rename from Testing/TestShared/ReadMe.cs rename to Testing/TestNetCore/ReadMe.cs index fb52657..607af38 100644 --- a/Testing/TestShared/ReadMe.cs +++ b/Testing/TestNetCore/ReadMe.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/ReadMeJson.cs b/Testing/TestNetCore/ReadMeJson.cs similarity index 98% rename from Testing/TestShared/ReadMeJson.cs rename to Testing/TestNetCore/ReadMeJson.cs index e1aa2c6..6ab1c95 100644 --- a/Testing/TestShared/ReadMeJson.cs +++ b/Testing/TestNetCore/ReadMeJson.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/Regex.cs b/Testing/TestNetCore/Regex.cs similarity index 83% rename from Testing/TestShared/Regex.cs rename to Testing/TestNetCore/Regex.cs index 6de11fc..bcff2d5 100644 --- a/Testing/TestShared/Regex.cs +++ b/Testing/TestNetCore/Regex.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -44,12 +44,7 @@ public void Test1() { var problems = cfg.Errors(); Assert.AreEqual(3, problems.Length); -#if CORE - // Assert.AreEqual("invalid has an invalid regex of [ Invalid pattern '[' at offset 1. Unterminated [] set.", problems[0]); - Assert.AreEqual("invalid has an invalid regex of [ parsing '[' - Unterminated [] set.", problems[0]); -#else - Assert.AreEqual("invalid has an invalid regex of [ parsing \"[\" - Unterminated [] set.", problems[0]); -#endif + Assert.AreEqual("invalid has an invalid regex of [ parsing '[' - Unterminated [] set.", problems[0]); Assert.AreEqual("bad value does not match regex ^[a-z0-9]*$ in value", problems[1]); Assert.AreEqual("bad-value does not match regex ^[a-zA-Z]*$ in name", problems[2]); diff --git a/Testing/TestShared/ShorthandTest.cs b/Testing/TestNetCore/ShorthandTest.cs similarity index 99% rename from Testing/TestShared/ShorthandTest.cs rename to Testing/TestNetCore/ShorthandTest.cs index 73f294c..af0d4f5 100644 --- a/Testing/TestShared/ShorthandTest.cs +++ b/Testing/TestNetCore/ShorthandTest.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/TestClasses/AttributeCfg.cs b/Testing/TestNetCore/TestClasses/AttributeCfg.cs similarity index 96% rename from Testing/TestShared/TestClasses/AttributeCfg.cs rename to Testing/TestNetCore/TestClasses/AttributeCfg.cs index 7cc2826..40a9a1d 100644 --- a/Testing/TestShared/TestClasses/AttributeCfg.cs +++ b/Testing/TestNetCore/TestClasses/AttributeCfg.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/TestClasses/AttributeSite.cs b/Testing/TestNetCore/TestClasses/AttributeSite.cs similarity index 96% rename from Testing/TestShared/TestClasses/AttributeSite.cs rename to Testing/TestNetCore/TestClasses/AttributeSite.cs index be8a47e..eecd204 100644 --- a/Testing/TestShared/TestClasses/AttributeSite.cs +++ b/Testing/TestNetCore/TestClasses/AttributeSite.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/TestClasses/Cfg.cs b/Testing/TestNetCore/TestClasses/Cfg.cs similarity index 97% rename from Testing/TestShared/TestClasses/Cfg.cs rename to Testing/TestNetCore/TestClasses/Cfg.cs index 966bbfd..8f93aba 100644 --- a/Testing/TestShared/TestClasses/Cfg.cs +++ b/Testing/TestNetCore/TestClasses/Cfg.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/TestClasses/CfgDatabase.cs b/Testing/TestNetCore/TestClasses/CfgDatabase.cs similarity index 96% rename from Testing/TestShared/TestClasses/CfgDatabase.cs rename to Testing/TestNetCore/TestClasses/CfgDatabase.cs index fc7a250..58f33c4 100644 --- a/Testing/TestShared/TestClasses/CfgDatabase.cs +++ b/Testing/TestNetCore/TestClasses/CfgDatabase.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/TestClasses/CfgEnvironment.cs b/Testing/TestNetCore/TestClasses/CfgEnvironment.cs similarity index 96% rename from Testing/TestShared/TestClasses/CfgEnvironment.cs rename to Testing/TestNetCore/TestClasses/CfgEnvironment.cs index add8414..2bd5bd8 100644 --- a/Testing/TestShared/TestClasses/CfgEnvironment.cs +++ b/Testing/TestNetCore/TestClasses/CfgEnvironment.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/TestClasses/CfgParameter.cs b/Testing/TestNetCore/TestClasses/CfgParameter.cs similarity index 96% rename from Testing/TestShared/TestClasses/CfgParameter.cs rename to Testing/TestNetCore/TestClasses/CfgParameter.cs index f6aade6..ec2a2eb 100644 --- a/Testing/TestShared/TestClasses/CfgParameter.cs +++ b/Testing/TestNetCore/TestClasses/CfgParameter.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/TestClasses/CfgServer.cs b/Testing/TestNetCore/TestClasses/CfgServer.cs similarity index 96% rename from Testing/TestShared/TestClasses/CfgServer.cs rename to Testing/TestNetCore/TestClasses/CfgServer.cs index c047c17..b09c84a 100644 --- a/Testing/TestShared/TestClasses/CfgServer.cs +++ b/Testing/TestNetCore/TestClasses/CfgServer.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestNetCore/TestNetCore.csproj b/Testing/TestNetCore/TestNetCore.csproj index acf6686..0f435e4 100644 --- a/Testing/TestNetCore/TestNetCore.csproj +++ b/Testing/TestNetCore/TestNetCore.csproj @@ -1,23 +1,11 @@ - + - net6.0 - + net10.0 false - - 0.15.0-beta - - 0.15.0 - - 0.15.0 - - - - TRACE;CORE - - - - TRACE;CORE + 0.16.0-beta + 0.16.0 + 0.16.0 @@ -39,24 +27,24 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + - - + + @@ -65,6 +53,4 @@ - - diff --git a/Testing/TestShared/ToJson.cs b/Testing/TestNetCore/ToJson.cs similarity index 98% rename from Testing/TestShared/ToJson.cs rename to Testing/TestNetCore/ToJson.cs index 151798b..f812fb0 100644 --- a/Testing/TestShared/ToJson.cs +++ b/Testing/TestNetCore/ToJson.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/ToXml.cs b/Testing/TestNetCore/ToXml.cs similarity index 98% rename from Testing/TestShared/ToXml.cs rename to Testing/TestNetCore/ToXml.cs index aece6cc..a814f6b 100644 --- a/Testing/TestShared/ToXml.cs +++ b/Testing/TestNetCore/ToXml.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/TraceLogger.cs b/Testing/TestNetCore/TraceLogger.cs similarity index 96% rename from Testing/TestShared/TraceLogger.cs rename to Testing/TestNetCore/TraceLogger.cs index 919bd19..038cb96 100644 --- a/Testing/TestShared/TraceLogger.cs +++ b/Testing/TestNetCore/TraceLogger.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/Trim.cs b/Testing/TestNetCore/Trim.cs similarity index 98% rename from Testing/TestShared/Trim.cs rename to Testing/TestNetCore/Trim.cs index 085b09b..30350d5 100644 --- a/Testing/TestShared/Trim.cs +++ b/Testing/TestNetCore/Trim.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/Types.cs b/Testing/TestNetCore/Types.cs similarity index 92% rename from Testing/TestShared/Types.cs rename to Testing/TestNetCore/Types.cs index dd38e81..cc7d970 100644 --- a/Testing/TestShared/Types.cs +++ b/Testing/TestNetCore/Types.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ public void TestWrongTypes() { var problems = cfg.Errors(); Assert.AreEqual(2, problems.Length); - Assert.AreEqual("Could not set IntValue to x inside things item. Input string was not in a correct format.", problems[0]); + StringAssert.StartsWith(problems[0], "Could not set IntValue to x inside things item."); Assert.AreEqual("Could not set ShortValue to 40000 inside things item. Value was either too large or too small for an Int16.", problems[1]); Assert.AreEqual(3, cfg.Things.First().IntValue); diff --git a/Testing/TestShared/UnitTest1.cs b/Testing/TestNetCore/UnitTest1.cs similarity index 100% rename from Testing/TestShared/UnitTest1.cs rename to Testing/TestNetCore/UnitTest1.cs diff --git a/Testing/TestShared/ValidatorTest.cs b/Testing/TestNetCore/ValidatorTest.cs similarity index 99% rename from Testing/TestShared/ValidatorTest.cs rename to Testing/TestNetCore/ValidatorTest.cs index 46177b3..4093b58 100644 --- a/Testing/TestShared/ValidatorTest.cs +++ b/Testing/TestNetCore/ValidatorTest.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/Value.cs b/Testing/TestNetCore/Value.cs similarity index 98% rename from Testing/TestShared/Value.cs rename to Testing/TestNetCore/Value.cs index aaadb86..fee42a3 100644 --- a/Testing/TestShared/Value.cs +++ b/Testing/TestNetCore/Value.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/Testing/TestShared/YamlDotNet.cs b/Testing/TestNetCore/YamlDotNet.cs similarity index 95% rename from Testing/TestShared/YamlDotNet.cs rename to Testing/TestNetCore/YamlDotNet.cs index a8c959a..2940b5c 100644 --- a/Testing/TestShared/YamlDotNet.cs +++ b/Testing/TestNetCore/YamlDotNet.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ public void TestYaml() { var builder = new SerializerBuilder(); // builder.EmitDefaults(); builder.ConfigureDefaultValuesHandling(DefaultValuesHandling.Preserve); - builder.WithNamingConvention(new HyphenatedNamingConvention()); + builder.WithNamingConvention(HyphenatedNamingConvention.Instance); var cfg = new TestYamlParser(yaml, new YamlDotNetParser(), new YamlDotNetSerializer(builder.Build())); diff --git a/Testing/TestShared/TestShared.projitems b/Testing/TestShared/TestShared.projitems deleted file mode 100644 index 3221930..0000000 --- a/Testing/TestShared/TestShared.projitems +++ /dev/null @@ -1,54 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - abb72ffc-c11c-493c-865a-2f13009c1937 - - - TestShared - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Testing/TestShared/TestShared.shproj b/Testing/TestShared/TestShared.shproj deleted file mode 100644 index 20a62aa..0000000 --- a/Testing/TestShared/TestShared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - abb72ffc-c11c-493c-865a-2f13009c1937 - 14.0 - - - - - - - - diff --git a/WE-Markdown.css b/WE-Markdown.css deleted file mode 100644 index 73bf50b..0000000 --- a/WE-Markdown.css +++ /dev/null @@ -1,6 +0,0 @@ -@import url('http://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css'); -@import url('http://cdnjs.cloudflare.com/ajax/libs/prettify/r298/prettify.css'); - -body { - font-family: PragmataPro, Verdana -} \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index d2f1e8c..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: 0.11.0.{build} -image: Visual Studio 2019 -before_build: -- cmd: nuget restore -build: - verbosity: minimal \ No newline at end of file diff --git a/Articles/Autofac.md b/docs/autofac.md similarity index 100% rename from Articles/Autofac.md rename to docs/autofac.md diff --git a/Articles/EnvironmentsAndParameters.md b/docs/environments-and-parameters.md similarity index 100% rename from Articles/EnvironmentsAndParameters.md rename to docs/environments-and-parameters.md diff --git a/docs/nuget-packaging.md b/docs/nuget-packaging.md new file mode 100644 index 0000000..e401846 --- /dev/null +++ b/docs/nuget-packaging.md @@ -0,0 +1,57 @@ +# NuGet Packaging and Publishing (Cross-Platform) + +This repository supports cross-platform NuGet packaging and publishing with `dotnet` CLI scripts. + +## Local packaging + +```bash +./scripts/nuget-pack.sh +``` + +Output packages are written to `artifacts/`. + +Optional flags: + +```bash +./scripts/nuget-pack.sh --dry-run +./scripts/nuget-pack.sh --configuration Debug +./scripts/nuget-pack.sh --output my-packages +``` + +`nuget-pack.sh` discovers SDK-style `src/**/*.csproj` projects that have `true` in their project file. + +## Local publishing + +Publish to NuGet.org: + +```bash +export NUGET_API_KEY="" +./scripts/nuget-push.sh --source nuget --api-key-env NUGET_API_KEY +``` + +Publish to MyGet: + +```bash +export MYGET_API_KEY="" +./scripts/nuget-push.sh --source myget --api-key-env MYGET_API_KEY +``` + +Dry run: + +```bash +./scripts/nuget-push.sh --source nuget --api-key-env NUGET_API_KEY --dry-run +``` + +## GitHub Actions (manual) + +Workflow: `.github/workflows/nuget-publish.yml` + +Required repository secrets: + +- `NUGET_API_KEY` for NuGet.org publishing +- `MYGET_API_KEY` for MyGet publishing + +Run the **NuGet Publish** workflow manually from the Actions tab and select: + +- whether to publish to NuGet.org +- whether to publish to MyGet diff --git a/Articles/Shorthand.md b/docs/shorthand.md similarity index 100% rename from Articles/Shorthand.md rename to docs/shorthand.md diff --git a/global.json b/global.json new file mode 100644 index 0000000..9dc0753 --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "rollForward": "latestFeature", + "version": "10.0.100" + } +} diff --git a/scripts/nuget-pack.sh b/scripts/nuget-pack.sh new file mode 100755 index 0000000..0f940e2 --- /dev/null +++ b/scripts/nuget-pack.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash +set -euo pipefail + +# Pack all packable SDK-style projects under src/ +# Usage: ./scripts/nuget-pack.sh [--configuration CONFIG] [--output DIR] [--dry-run] + +CONFIGURATION="Release" +OUTPUT="artifacts" +DRY_RUN=false + +while [[ $# -gt 0 ]]; do + case "$1" in + --configuration) CONFIGURATION="$2"; shift 2 ;; + --output) OUTPUT="$2"; shift 2 ;; + --dry-run) DRY_RUN=true; shift ;; + *) echo "Unknown option: $1"; exit 1 ;; + esac +done + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)" + +mkdir -p "$ROOT_DIR/$OUTPUT" + +echo "Discovering packable projects..." + +FOUND=0 +while IFS= read -r csproj; do + # Only pack projects with IsPackable=true + if ! grep -q 'true' "$csproj" 2>/dev/null; then + continue + fi + + PACKAGE_ID=$(sed -n 's/.*\([^<]*\)<\/PackageId>.*/\1/p' "$csproj" 2>/dev/null | head -1) + if [[ -z "$PACKAGE_ID" ]]; then + PACKAGE_ID="$(basename "$csproj" .csproj)" + fi + + FOUND=$((FOUND + 1)) + if $DRY_RUN; then + echo " [dry-run] would pack: $PACKAGE_ID ($csproj)" + else + echo " Packing: $PACKAGE_ID" + dotnet pack "$csproj" \ + --configuration "$CONFIGURATION" \ + --output "$ROOT_DIR/$OUTPUT" \ + -p:ContinuousIntegrationBuild=true \ + --verbosity quiet + fi +done < <(find "$ROOT_DIR/src" -name '*.csproj' -type f | sort) + +echo "Done. $FOUND package(s) found." diff --git a/scripts/nuget-push.sh b/scripts/nuget-push.sh new file mode 100755 index 0000000..8b22112 --- /dev/null +++ b/scripts/nuget-push.sh @@ -0,0 +1,71 @@ +#!/usr/bin/env bash +set -euo pipefail + +# Push .nupkg files to NuGet.org or MyGet +# Usage: ./scripts/nuget-push.sh --source nuget|myget| --api-key-env VAR_NAME [--output DIR] [--dry-run] + +SOURCE="" +API_KEY_ENV="" +OUTPUT="artifacts" +DRY_RUN=false + +NUGET_URL="https://api.nuget.org/v3/index.json" +MYGET_URL="https://www.myget.org/F/cfg-net/api/v3/index.json" + +while [[ $# -gt 0 ]]; do + case "$1" in + --source) SOURCE="$2"; shift 2 ;; + --api-key-env) API_KEY_ENV="$2"; shift 2 ;; + --output) OUTPUT="$2"; shift 2 ;; + --dry-run) DRY_RUN=true; shift ;; + *) echo "Unknown option: $1"; exit 1 ;; + esac +done + +if [[ -z "$SOURCE" ]]; then + echo "Error: --source is required (nuget, myget, or a URL)" + exit 1 +fi + +case "$SOURCE" in + nuget) PUSH_URL="$NUGET_URL" ;; + myget) PUSH_URL="$MYGET_URL" ;; + *) PUSH_URL="$SOURCE" ;; +esac + +if [[ -z "$API_KEY_ENV" ]]; then + echo "Error: --api-key-env is required" + exit 1 +fi + +API_KEY="${!API_KEY_ENV:-}" +if [[ -z "$API_KEY" && "$DRY_RUN" == "false" ]]; then + echo "Error: environment variable $API_KEY_ENV is not set" + exit 1 +fi + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)" + +PACKAGES=("$ROOT_DIR/$OUTPUT"/*.nupkg) +if [[ ${#PACKAGES[@]} -eq 0 || ! -e "${PACKAGES[0]}" ]]; then + echo "No .nupkg files found in $ROOT_DIR/$OUTPUT" + exit 1 +fi + +echo "Pushing ${#PACKAGES[@]} package(s) to $PUSH_URL..." + +for pkg in "${PACKAGES[@]}"; do + NAME="$(basename "$pkg")" + if $DRY_RUN; then + echo " [dry-run] would push: $NAME" + else + echo " Pushing: $NAME" + dotnet nuget push "$pkg" \ + --source "$PUSH_URL" \ + --api-key "$API_KEY" \ + --skip-duplicate + fi +done + +echo "Done." diff --git a/src/Customizers/Environment/Cfg.Net.Environment.Shared/Cfg.Net.Environment.Shared.projitems b/src/Customizers/Environment/Cfg.Net.Environment.Shared/Cfg.Net.Environment.Shared.projitems deleted file mode 100644 index 5b8cc5e..0000000 --- a/src/Customizers/Environment/Cfg.Net.Environment.Shared/Cfg.Net.Environment.Shared.projitems +++ /dev/null @@ -1,17 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - d17d76ea-69c0-4ec1-8e35-d15c4eb3f4b0 - - - Cfg.Net.Environment.Shared - - - - - - - - \ No newline at end of file diff --git a/src/Customizers/Environment/Cfg.Net.Environment.Shared/Cfg.Net.Environment.Shared.shproj b/src/Customizers/Environment/Cfg.Net.Environment.Shared/Cfg.Net.Environment.Shared.shproj deleted file mode 100644 index 5e8771f..0000000 --- a/src/Customizers/Environment/Cfg.Net.Environment.Shared/Cfg.Net.Environment.Shared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - d17d76ea-69c0-4ec1-8e35-d15c4eb3f4b0 - 14.0 - - - - - - - - diff --git a/src/Customizers/Environment/Cfg.Net.Environment.Standard.20/Cfg.Net.Environment.Standard.20.csproj b/src/Customizers/Environment/Cfg.Net.Environment.Standard.20/Cfg.Net.Environment.Standard.20.csproj deleted file mode 100644 index 85237e0..0000000 --- a/src/Customizers/Environment/Cfg.Net.Environment.Standard.20/Cfg.Net.Environment.Standard.20.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netstandard2.0 - Cfg.Net.Environment - Cfg.Net.Environment - 0.15.0-beta - 0.15.0 - 0.15.0 - - - - - - - - - diff --git a/src/Customizers/Environment/Cfg.Net.Environment.Standard.21/Cfg.Net.Environment.Standard.21.csproj b/src/Customizers/Environment/Cfg.Net.Environment.Standard.21/Cfg.Net.Environment.Standard.21.csproj deleted file mode 100644 index db6fcd1..0000000 --- a/src/Customizers/Environment/Cfg.Net.Environment.Standard.21/Cfg.Net.Environment.Standard.21.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netstandard2.1 - Cfg.Net.Environment - Cfg.Net.Environment - 0.15.0-beta - 0.15.0 - 0.15.0 - - - - - - - - - diff --git a/src/Customizers/Environment/Cfg.Net.Environment/Cfg.Net.Environment.csproj b/src/Customizers/Environment/Cfg.Net.Environment/Cfg.Net.Environment.csproj new file mode 100644 index 0000000..1f6418f --- /dev/null +++ b/src/Customizers/Environment/Cfg.Net.Environment/Cfg.Net.Environment.csproj @@ -0,0 +1,24 @@ + + + netstandard2.0;netstandard2.1 + Cfg.Net.Environment + Cfg.Net.Environment + 0.16.0-beta + 0.16.0 + 0.16.0 + true + Cfg-NET.Environment + Dale Newman + environment and parameter customizer for Cfg-NET + Copyright 2015-2026 Dale Newman + Apache-2.0 + configuration;cfgnet;environment + https://github.com/dalenewman/Cfg-NET + https://github.com/dalenewman/Cfg-NET + git + en-US + + + + + diff --git a/src/Customizers/Environment/Cfg.Net.Environment.Shared/EnvironmentModifier.cs b/src/Customizers/Environment/Cfg.Net.Environment/EnvironmentModifier.cs similarity index 99% rename from src/Customizers/Environment/Cfg.Net.Environment.Shared/EnvironmentModifier.cs rename to src/Customizers/Environment/Cfg.Net.Environment/EnvironmentModifier.cs index c3cb9b7..277bc3e 100644 --- a/src/Customizers/Environment/Cfg.Net.Environment.Shared/EnvironmentModifier.cs +++ b/src/Customizers/Environment/Cfg.Net.Environment/EnvironmentModifier.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Customizers/Environment/Cfg.Net.Environment.Shared/IPlaceHolderReplacer.cs b/src/Customizers/Environment/Cfg.Net.Environment/IPlaceHolderReplacer.cs similarity index 96% rename from src/Customizers/Environment/Cfg.Net.Environment.Shared/IPlaceHolderReplacer.cs rename to src/Customizers/Environment/Cfg.Net.Environment/IPlaceHolderReplacer.cs index 61bf7ca..24c9c43 100644 --- a/src/Customizers/Environment/Cfg.Net.Environment.Shared/IPlaceHolderReplacer.cs +++ b/src/Customizers/Environment/Cfg.Net.Environment/IPlaceHolderReplacer.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Customizers/Environment/Cfg.Net.Environment.Shared/ParameterModifier.cs b/src/Customizers/Environment/Cfg.Net.Environment/ParameterModifier.cs similarity index 99% rename from src/Customizers/Environment/Cfg.Net.Environment.Shared/ParameterModifier.cs rename to src/Customizers/Environment/Cfg.Net.Environment/ParameterModifier.cs index 97da119..4f2f71e 100644 --- a/src/Customizers/Environment/Cfg.Net.Environment.Shared/ParameterModifier.cs +++ b/src/Customizers/Environment/Cfg.Net.Environment/ParameterModifier.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Customizers/Environment/Cfg.Net.Environment.Shared/PlaceHolderReplacer.cs b/src/Customizers/Environment/Cfg.Net.Environment/PlaceHolderReplacer.cs similarity index 98% rename from src/Customizers/Environment/Cfg.Net.Environment.Shared/PlaceHolderReplacer.cs rename to src/Customizers/Environment/Cfg.Net.Environment/PlaceHolderReplacer.cs index 37ecb74..2967b9c 100644 --- a/src/Customizers/Environment/Cfg.Net.Environment.Shared/PlaceHolderReplacer.cs +++ b/src/Customizers/Environment/Cfg.Net.Environment/PlaceHolderReplacer.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Cfg.Net.Shorthand.Shared.projitems b/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Cfg.Net.Shorthand.Shared.projitems deleted file mode 100644 index 2715440..0000000 --- a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Cfg.Net.Shorthand.Shared.projitems +++ /dev/null @@ -1,25 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - 28da6c7f-a14d-4787-9d61-457997288d99 - - - Cfg.Net.Shorthand.Shared - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Cfg.Net.Shorthand.Shared.shproj b/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Cfg.Net.Shorthand.Shared.shproj deleted file mode 100644 index a864deb..0000000 --- a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Cfg.Net.Shorthand.Shared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - 28da6c7f-a14d-4787-9d61-457997288d99 - 14.0 - - - - - - - - diff --git a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Standard.20/Cfg.Net.Shorthand.Standard.20.csproj b/src/Customizers/Shorthand/Cfg.Net.Shorthand.Standard.20/Cfg.Net.Shorthand.Standard.20.csproj deleted file mode 100644 index 33bfda3..0000000 --- a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Standard.20/Cfg.Net.Shorthand.Standard.20.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netstandard2.0 - Cfg.Net.Shorthand - Cfg.Net.Shorthand - 0.15.0-beta - 0.15.0 - 0.15.0 - - - - - - - - - diff --git a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Standard.21/Cfg.Net.Shorthand.Standard.21.csproj b/src/Customizers/Shorthand/Cfg.Net.Shorthand.Standard.21/Cfg.Net.Shorthand.Standard.21.csproj deleted file mode 100644 index 3c2aeb6..0000000 --- a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Standard.21/Cfg.Net.Shorthand.Standard.21.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netstandard2.1 - Cfg.Net.Shorthand - Cfg.Net.Shorthand - 0.15.0-beta - 0.15.0 - 0.15.0 - - - - - - - - - diff --git a/src/Customizers/Shorthand/Cfg.Net.Shorthand/Cfg.Net.Shorthand.csproj b/src/Customizers/Shorthand/Cfg.Net.Shorthand/Cfg.Net.Shorthand.csproj new file mode 100644 index 0000000..4fbc9f5 --- /dev/null +++ b/src/Customizers/Shorthand/Cfg.Net.Shorthand/Cfg.Net.Shorthand.csproj @@ -0,0 +1,24 @@ + + + netstandard2.0;netstandard2.1 + Cfg.Net.Shorthand + Cfg.Net.Shorthand + 0.16.0-beta + 0.16.0 + 0.16.0 + true + Cfg-NET.Shorthand + Dale Newman + shorthand expression customizer for Cfg-NET + Copyright 2015-2026 Dale Newman + Apache-2.0 + configuration;cfgnet;shorthand + https://github.com/dalenewman/Cfg-NET + https://github.com/dalenewman/Cfg-NET + git + en-US + + + + + diff --git a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Expression.cs b/src/Customizers/Shorthand/Cfg.Net.Shorthand/Expression.cs similarity index 97% rename from src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Expression.cs rename to src/Customizers/Shorthand/Cfg.Net.Shorthand/Expression.cs index 1ca7193..49a2ff0 100644 --- a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Expression.cs +++ b/src/Customizers/Shorthand/Cfg.Net.Shorthand/Expression.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Expressions.cs b/src/Customizers/Shorthand/Cfg.Net.Shorthand/Expressions.cs similarity index 98% rename from src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Expressions.cs rename to src/Customizers/Shorthand/Cfg.Net.Shorthand/Expressions.cs index ff02753..07e22ce 100644 --- a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Expressions.cs +++ b/src/Customizers/Shorthand/Cfg.Net.Shorthand/Expressions.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Method.cs b/src/Customizers/Shorthand/Cfg.Net.Shorthand/Method.cs similarity index 96% rename from src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Method.cs rename to src/Customizers/Shorthand/Cfg.Net.Shorthand/Method.cs index 13637b7..161d5ce 100644 --- a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Method.cs +++ b/src/Customizers/Shorthand/Cfg.Net.Shorthand/Method.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/MethodData.cs b/src/Customizers/Shorthand/Cfg.Net.Shorthand/MethodData.cs similarity index 96% rename from src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/MethodData.cs rename to src/Customizers/Shorthand/Cfg.Net.Shorthand/MethodData.cs index 744adde..1bd87cf 100644 --- a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/MethodData.cs +++ b/src/Customizers/Shorthand/Cfg.Net.Shorthand/MethodData.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Node.cs b/src/Customizers/Shorthand/Cfg.Net.Shorthand/Node.cs similarity index 97% rename from src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Node.cs rename to src/Customizers/Shorthand/Cfg.Net.Shorthand/Node.cs index b6ac546..a6adbb7 100644 --- a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Node.cs +++ b/src/Customizers/Shorthand/Cfg.Net.Shorthand/Node.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Parameter.cs b/src/Customizers/Shorthand/Cfg.Net.Shorthand/Parameter.cs similarity index 96% rename from src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Parameter.cs rename to src/Customizers/Shorthand/Cfg.Net.Shorthand/Parameter.cs index d5ed860..df18fd6 100644 --- a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Parameter.cs +++ b/src/Customizers/Shorthand/Cfg.Net.Shorthand/Parameter.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/ShorthandAttribute.cs b/src/Customizers/Shorthand/Cfg.Net.Shorthand/ShorthandAttribute.cs similarity index 96% rename from src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/ShorthandAttribute.cs rename to src/Customizers/Shorthand/Cfg.Net.Shorthand/ShorthandAttribute.cs index 7c905cc..716e2cb 100644 --- a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/ShorthandAttribute.cs +++ b/src/Customizers/Shorthand/Cfg.Net.Shorthand/ShorthandAttribute.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/ShorthandCustomizer.cs b/src/Customizers/Shorthand/Cfg.Net.Shorthand/ShorthandCustomizer.cs similarity index 99% rename from src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/ShorthandCustomizer.cs rename to src/Customizers/Shorthand/Cfg.Net.Shorthand/ShorthandCustomizer.cs index 60bce12..8a3f6a0 100644 --- a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/ShorthandCustomizer.cs +++ b/src/Customizers/Shorthand/Cfg.Net.Shorthand/ShorthandCustomizer.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/ShorthandRoot.cs b/src/Customizers/Shorthand/Cfg.Net.Shorthand/ShorthandRoot.cs similarity index 97% rename from src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/ShorthandRoot.cs rename to src/Customizers/Shorthand/Cfg.Net.Shorthand/ShorthandRoot.cs index 5193170..541bb03 100644 --- a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/ShorthandRoot.cs +++ b/src/Customizers/Shorthand/Cfg.Net.Shorthand/ShorthandRoot.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Signature.cs b/src/Customizers/Shorthand/Cfg.Net.Shorthand/Signature.cs similarity index 96% rename from src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Signature.cs rename to src/Customizers/Shorthand/Cfg.Net.Shorthand/Signature.cs index 2331221..6cb6971 100644 --- a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Signature.cs +++ b/src/Customizers/Shorthand/Cfg.Net.Shorthand/Signature.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Target.cs b/src/Customizers/Shorthand/Cfg.Net.Shorthand/Target.cs similarity index 96% rename from src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Target.cs rename to src/Customizers/Shorthand/Cfg.Net.Shorthand/Target.cs index 968abcb..f82c5ca 100644 --- a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Target.cs +++ b/src/Customizers/Shorthand/Cfg.Net.Shorthand/Target.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Utility.cs b/src/Customizers/Shorthand/Cfg.Net.Shorthand/Utility.cs similarity index 98% rename from src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Utility.cs rename to src/Customizers/Shorthand/Cfg.Net.Shorthand/Utility.cs index 5a8fbe2..2ab911b 100644 --- a/src/Customizers/Shorthand/Cfg.Net.Shorthand.Shared/Utility.cs +++ b/src/Customizers/Shorthand/Cfg.Net.Shorthand/Utility.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Cfg.Net.Shared.projitems b/src/Main/Cfg.Net.Shared/Cfg.Net.Shared.projitems deleted file mode 100644 index 2b1b291..0000000 --- a/src/Main/Cfg.Net.Shared/Cfg.Net.Shared.projitems +++ /dev/null @@ -1,51 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - 20ecb16c-d7e6-41ca-a8ed-3c197057eccd - - - Cfg.Net.Shared - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Main/Cfg.Net.Shared/Cfg.Net.Shared.shproj b/src/Main/Cfg.Net.Shared/Cfg.Net.Shared.shproj deleted file mode 100644 index dbf768a..0000000 --- a/src/Main/Cfg.Net.Shared/Cfg.Net.Shared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - 20ecb16c-d7e6-41ca-a8ed-3c197057eccd - 14.0 - - - - - - - - diff --git a/src/Main/Cfg.Net.Standard.20/Cfg.Net.Standard.20.csproj b/src/Main/Cfg.Net.Standard.20/Cfg.Net.Standard.20.csproj deleted file mode 100644 index 708dbe8..0000000 --- a/src/Main/Cfg.Net.Standard.20/Cfg.Net.Standard.20.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - netstandard2.0 - Cfg.Net - CfgNet - 0.15.0-beta - Copyright © 2015-2020 - an alternative configuration library - Cfg-NET - Dale Newman - en-US - 0.15.0 - 0.15.0 - - - \ No newline at end of file diff --git a/src/Main/Cfg.Net.Standard.21/Cfg.Net.Standard.21.csproj b/src/Main/Cfg.Net.Standard.21/Cfg.Net.Standard.21.csproj deleted file mode 100644 index 6c01392..0000000 --- a/src/Main/Cfg.Net.Standard.21/Cfg.Net.Standard.21.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - netstandard2.1 - Cfg.Net - CfgNet - 0.15.0-beta - Copyright © 2015-2022 - an alternative configuration library - Cfg-NET - Dale Newman - en-US - 0.15.0 - 0.15.0 - - - \ No newline at end of file diff --git a/src/Main/Cfg.Net/Cfg.Net.csproj b/src/Main/Cfg.Net/Cfg.Net.csproj new file mode 100644 index 0000000..c1bc1d5 --- /dev/null +++ b/src/Main/Cfg.Net/Cfg.Net.csproj @@ -0,0 +1,21 @@ + + + netstandard2.0;netstandard2.1 + Cfg.Net + CfgNet + 0.16.0-beta + 0.16.0 + 0.16.0 + true + Cfg-NET + Dale Newman + an alternative .net configuration handler with validation + Copyright 2015-2026 Dale Newman + Apache-2.0 + configuration;settings;xml;json;cfgnet + https://github.com/dalenewman/Cfg-NET + https://github.com/dalenewman/Cfg-NET + git + en-US + + diff --git a/src/Main/Cfg.Net.Shared/CfgAttribute.cs b/src/Main/Cfg.Net/CfgAttribute.cs similarity index 99% rename from src/Main/Cfg.Net.Shared/CfgAttribute.cs rename to src/Main/Cfg.Net/CfgAttribute.cs index 9fedc8b..00ad7fd 100644 --- a/src/Main/Cfg.Net.Shared/CfgAttribute.cs +++ b/src/Main/Cfg.Net/CfgAttribute.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/CfgConstants.cs b/src/Main/Cfg.Net/CfgConstants.cs similarity index 98% rename from src/Main/Cfg.Net.Shared/CfgConstants.cs rename to src/Main/Cfg.Net/CfgConstants.cs index 8b3a3d2..d134386 100644 --- a/src/Main/Cfg.Net.Shared/CfgConstants.cs +++ b/src/Main/Cfg.Net/CfgConstants.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/CfgEventArgs.cs b/src/Main/Cfg.Net/CfgEventArgs.cs similarity index 100% rename from src/Main/Cfg.Net.Shared/CfgEventArgs.cs rename to src/Main/Cfg.Net/CfgEventArgs.cs diff --git a/src/Main/Cfg.Net.Shared/CfgEvents.cs b/src/Main/Cfg.Net/CfgEvents.cs similarity index 99% rename from src/Main/Cfg.Net.Shared/CfgEvents.cs rename to src/Main/Cfg.Net/CfgEvents.cs index 8069f28..c5d5d76 100644 --- a/src/Main/Cfg.Net.Shared/CfgEvents.cs +++ b/src/Main/Cfg.Net/CfgEvents.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/CfgMetadata.cs b/src/Main/Cfg.Net/CfgMetadata.cs similarity index 98% rename from src/Main/Cfg.Net.Shared/CfgMetadata.cs rename to src/Main/Cfg.Net/CfgMetadata.cs index 5b78b58..ee8fcb7 100644 --- a/src/Main/Cfg.Net.Shared/CfgMetadata.cs +++ b/src/Main/Cfg.Net/CfgMetadata.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/CfgMetadataCache.cs b/src/Main/Cfg.Net/CfgMetadataCache.cs similarity index 99% rename from src/Main/Cfg.Net.Shared/CfgMetadataCache.cs rename to src/Main/Cfg.Net/CfgMetadataCache.cs index 6cf3ae6..323ebc3 100644 --- a/src/Main/Cfg.Net.Shared/CfgMetadataCache.cs +++ b/src/Main/Cfg.Net/CfgMetadataCache.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/CfgNode.cs b/src/Main/Cfg.Net/CfgNode.cs similarity index 99% rename from src/Main/Cfg.Net.Shared/CfgNode.cs rename to src/Main/Cfg.Net/CfgNode.cs index 4fb34aa..312f0db 100644 --- a/src/Main/Cfg.Net.Shared/CfgNode.cs +++ b/src/Main/Cfg.Net/CfgNode.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/CfgReflectionHelper.cs b/src/Main/Cfg.Net/CfgReflectionHelper.cs similarity index 98% rename from src/Main/Cfg.Net.Shared/CfgReflectionHelper.cs rename to src/Main/Cfg.Net/CfgReflectionHelper.cs index c1333d7..acd4150 100644 --- a/src/Main/Cfg.Net.Shared/CfgReflectionHelper.cs +++ b/src/Main/Cfg.Net/CfgReflectionHelper.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Contracts/IActiveReader.cs b/src/Main/Cfg.Net/Contracts/IActiveReader.cs similarity index 96% rename from src/Main/Cfg.Net.Shared/Contracts/IActiveReader.cs rename to src/Main/Cfg.Net/Contracts/IActiveReader.cs index 8e5ef36..5cd1906 100644 --- a/src/Main/Cfg.Net.Shared/Contracts/IActiveReader.cs +++ b/src/Main/Cfg.Net/Contracts/IActiveReader.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Contracts/IAttribute.cs b/src/Main/Cfg.Net/Contracts/IAttribute.cs similarity index 95% rename from src/Main/Cfg.Net.Shared/Contracts/IAttribute.cs rename to src/Main/Cfg.Net/Contracts/IAttribute.cs index 72c9e15..f5fae3a 100644 --- a/src/Main/Cfg.Net.Shared/Contracts/IAttribute.cs +++ b/src/Main/Cfg.Net/Contracts/IAttribute.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Contracts/ICustomizer.cs b/src/Main/Cfg.Net/Contracts/ICustomizer.cs similarity index 98% rename from src/Main/Cfg.Net.Shared/Contracts/ICustomizer.cs rename to src/Main/Cfg.Net/Contracts/ICustomizer.cs index e03164d..2fa906f 100644 --- a/src/Main/Cfg.Net.Shared/Contracts/ICustomizer.cs +++ b/src/Main/Cfg.Net/Contracts/ICustomizer.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Contracts/IDependency.cs b/src/Main/Cfg.Net/Contracts/IDependency.cs similarity index 95% rename from src/Main/Cfg.Net.Shared/Contracts/IDependency.cs rename to src/Main/Cfg.Net/Contracts/IDependency.cs index f11ced1..797d3d8 100644 --- a/src/Main/Cfg.Net.Shared/Contracts/IDependency.cs +++ b/src/Main/Cfg.Net/Contracts/IDependency.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Contracts/ILogger.cs b/src/Main/Cfg.Net/Contracts/ILogger.cs similarity index 95% rename from src/Main/Cfg.Net.Shared/Contracts/ILogger.cs rename to src/Main/Cfg.Net/Contracts/ILogger.cs index 3e38f40..5cd947e 100644 --- a/src/Main/Cfg.Net.Shared/Contracts/ILogger.cs +++ b/src/Main/Cfg.Net/Contracts/ILogger.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Contracts/INode.cs b/src/Main/Cfg.Net/Contracts/INode.cs similarity index 96% rename from src/Main/Cfg.Net.Shared/Contracts/INode.cs rename to src/Main/Cfg.Net/Contracts/INode.cs index 97cd5aa..87edfe6 100644 --- a/src/Main/Cfg.Net.Shared/Contracts/INode.cs +++ b/src/Main/Cfg.Net/Contracts/INode.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Contracts/IParser.cs b/src/Main/Cfg.Net/Contracts/IParser.cs similarity index 95% rename from src/Main/Cfg.Net.Shared/Contracts/IParser.cs rename to src/Main/Cfg.Net/Contracts/IParser.cs index 4e3fada..a87861f 100644 --- a/src/Main/Cfg.Net.Shared/Contracts/IParser.cs +++ b/src/Main/Cfg.Net/Contracts/IParser.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Contracts/IProperties.cs b/src/Main/Cfg.Net/Contracts/IProperties.cs similarity index 95% rename from src/Main/Cfg.Net.Shared/Contracts/IProperties.cs rename to src/Main/Cfg.Net/Contracts/IProperties.cs index e547717..d0b4042 100644 --- a/src/Main/Cfg.Net.Shared/Contracts/IProperties.cs +++ b/src/Main/Cfg.Net/Contracts/IProperties.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Contracts/IReader.cs b/src/Main/Cfg.Net/Contracts/IReader.cs similarity index 95% rename from src/Main/Cfg.Net.Shared/Contracts/IReader.cs rename to src/Main/Cfg.Net/Contracts/IReader.cs index 95a425a..609047b 100644 --- a/src/Main/Cfg.Net.Shared/Contracts/IReader.cs +++ b/src/Main/Cfg.Net/Contracts/IReader.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Contracts/ISerializer.cs b/src/Main/Cfg.Net/Contracts/ISerializer.cs similarity index 95% rename from src/Main/Cfg.Net.Shared/Contracts/ISerializer.cs rename to src/Main/Cfg.Net/Contracts/ISerializer.cs index 23b5034..0dfef30 100644 --- a/src/Main/Cfg.Net.Shared/Contracts/ISerializer.cs +++ b/src/Main/Cfg.Net/Contracts/ISerializer.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Ext/Extensions.cs b/src/Main/Cfg.Net/Ext/Extensions.cs similarity index 98% rename from src/Main/Cfg.Net.Shared/Ext/Extensions.cs rename to src/Main/Cfg.Net/Ext/Extensions.cs index ecbf481..720d039 100644 --- a/src/Main/Cfg.Net.Shared/Ext/Extensions.cs +++ b/src/Main/Cfg.Net/Ext/Extensions.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Ext/Logs/2016-01-12-JunkDrawer.txt b/src/Main/Cfg.Net/Ext/Logs/2016-01-12-JunkDrawer.txt similarity index 100% rename from src/Main/Cfg.Net.Shared/Ext/Logs/2016-01-12-JunkDrawer.txt rename to src/Main/Cfg.Net/Ext/Logs/2016-01-12-JunkDrawer.txt diff --git a/src/Main/Cfg.Net.Shared/Loggers/DefaultLogger.cs b/src/Main/Cfg.Net/Loggers/DefaultLogger.cs similarity index 98% rename from src/Main/Cfg.Net.Shared/Loggers/DefaultLogger.cs rename to src/Main/Cfg.Net/Loggers/DefaultLogger.cs index 72a34d0..88d07a4 100644 --- a/src/Main/Cfg.Net.Shared/Loggers/DefaultLogger.cs +++ b/src/Main/Cfg.Net/Loggers/DefaultLogger.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Loggers/MemoryLogger.cs b/src/Main/Cfg.Net/Loggers/MemoryLogger.cs similarity index 98% rename from src/Main/Cfg.Net.Shared/Loggers/MemoryLogger.cs rename to src/Main/Cfg.Net/Loggers/MemoryLogger.cs index 93cc6f8..fe12e96 100644 --- a/src/Main/Cfg.Net.Shared/Loggers/MemoryLogger.cs +++ b/src/Main/Cfg.Net/Loggers/MemoryLogger.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Loggers/NullLogger.cs b/src/Main/Cfg.Net/Loggers/NullLogger.cs similarity index 96% rename from src/Main/Cfg.Net.Shared/Loggers/NullLogger.cs rename to src/Main/Cfg.Net/Loggers/NullLogger.cs index 02cdbd1..a489a6d 100644 --- a/src/Main/Cfg.Net.Shared/Loggers/NullLogger.cs +++ b/src/Main/Cfg.Net/Loggers/NullLogger.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Parsers/CollectionNode.cs b/src/Main/Cfg.Net/Parsers/CollectionNode.cs similarity index 97% rename from src/Main/Cfg.Net.Shared/Parsers/CollectionNode.cs rename to src/Main/Cfg.Net/Parsers/CollectionNode.cs index 97245c7..53062f7 100644 --- a/src/Main/Cfg.Net.Shared/Parsers/CollectionNode.cs +++ b/src/Main/Cfg.Net/Parsers/CollectionNode.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Parsers/JsonNode.cs b/src/Main/Cfg.Net/Parsers/JsonNode.cs similarity index 99% rename from src/Main/Cfg.Net.Shared/Parsers/JsonNode.cs rename to src/Main/Cfg.Net/Parsers/JsonNode.cs index 01419d4..3314690 100644 --- a/src/Main/Cfg.Net.Shared/Parsers/JsonNode.cs +++ b/src/Main/Cfg.Net/Parsers/JsonNode.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Parsers/JsonParser.cs b/src/Main/Cfg.Net/Parsers/JsonParser.cs similarity index 96% rename from src/Main/Cfg.Net.Shared/Parsers/JsonParser.cs rename to src/Main/Cfg.Net/Parsers/JsonParser.cs index 20ef533..938bb37 100644 --- a/src/Main/Cfg.Net.Shared/Parsers/JsonParser.cs +++ b/src/Main/Cfg.Net/Parsers/JsonParser.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Parsers/NodeAttribute.cs b/src/Main/Cfg.Net/Parsers/NodeAttribute.cs similarity index 96% rename from src/Main/Cfg.Net.Shared/Parsers/NodeAttribute.cs rename to src/Main/Cfg.Net/Parsers/NodeAttribute.cs index c40af6c..c30191d 100644 --- a/src/Main/Cfg.Net.Shared/Parsers/NodeAttribute.cs +++ b/src/Main/Cfg.Net/Parsers/NodeAttribute.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Parsers/ObjectNode.cs b/src/Main/Cfg.Net/Parsers/ObjectNode.cs similarity index 98% rename from src/Main/Cfg.Net.Shared/Parsers/ObjectNode.cs rename to src/Main/Cfg.Net/Parsers/ObjectNode.cs index 49b8b3b..8c790cf 100644 --- a/src/Main/Cfg.Net.Shared/Parsers/ObjectNode.cs +++ b/src/Main/Cfg.Net/Parsers/ObjectNode.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Parsers/XmlNode.cs b/src/Main/Cfg.Net/Parsers/XmlNode.cs similarity index 98% rename from src/Main/Cfg.Net.Shared/Parsers/XmlNode.cs rename to src/Main/Cfg.Net/Parsers/XmlNode.cs index e74d954..b7bfc91 100644 --- a/src/Main/Cfg.Net.Shared/Parsers/XmlNode.cs +++ b/src/Main/Cfg.Net/Parsers/XmlNode.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Parsers/XmlParser.cs b/src/Main/Cfg.Net/Parsers/XmlParser.cs similarity index 96% rename from src/Main/Cfg.Net.Shared/Parsers/XmlParser.cs rename to src/Main/Cfg.Net/Parsers/XmlParser.cs index bb97b26..b705957 100644 --- a/src/Main/Cfg.Net.Shared/Parsers/XmlParser.cs +++ b/src/Main/Cfg.Net/Parsers/XmlParser.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Parsers/fastJSON/JSON.cs b/src/Main/Cfg.Net/Parsers/fastJSON/JSON.cs similarity index 99% rename from src/Main/Cfg.Net.Shared/Parsers/fastJSON/JSON.cs rename to src/Main/Cfg.Net/Parsers/fastJSON/JSON.cs index 19adbb9..d4764ae 100644 --- a/src/Main/Cfg.Net.Shared/Parsers/fastJSON/JSON.cs +++ b/src/Main/Cfg.Net/Parsers/fastJSON/JSON.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Parsers/fastJSON/JsonParser.cs b/src/Main/Cfg.Net/Parsers/fastJSON/JsonParser.cs similarity index 99% rename from src/Main/Cfg.Net.Shared/Parsers/fastJSON/JsonParser.cs rename to src/Main/Cfg.Net/Parsers/fastJSON/JsonParser.cs index 1209299..3edacf5 100644 --- a/src/Main/Cfg.Net.Shared/Parsers/fastJSON/JsonParser.cs +++ b/src/Main/Cfg.Net/Parsers/fastJSON/JsonParser.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Parsers/nanoXML/NanoXmlAttribute.cs b/src/Main/Cfg.Net/Parsers/nanoXML/NanoXmlAttribute.cs similarity index 97% rename from src/Main/Cfg.Net.Shared/Parsers/nanoXML/NanoXmlAttribute.cs rename to src/Main/Cfg.Net/Parsers/nanoXML/NanoXmlAttribute.cs index 8b3a10d..60f3ba1 100644 --- a/src/Main/Cfg.Net.Shared/Parsers/nanoXML/NanoXmlAttribute.cs +++ b/src/Main/Cfg.Net/Parsers/nanoXML/NanoXmlAttribute.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Parsers/nanoXML/NanoXmlBase.cs b/src/Main/Cfg.Net/Parsers/nanoXML/NanoXmlBase.cs similarity index 99% rename from src/Main/Cfg.Net.Shared/Parsers/nanoXML/NanoXmlBase.cs rename to src/Main/Cfg.Net/Parsers/nanoXML/NanoXmlBase.cs index 48103ac..020a45e 100644 --- a/src/Main/Cfg.Net.Shared/Parsers/nanoXML/NanoXmlBase.cs +++ b/src/Main/Cfg.Net/Parsers/nanoXML/NanoXmlBase.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Parsers/nanoXML/NanoXmlDocument.cs b/src/Main/Cfg.Net/Parsers/nanoXML/NanoXmlDocument.cs similarity index 98% rename from src/Main/Cfg.Net.Shared/Parsers/nanoXML/NanoXmlDocument.cs rename to src/Main/Cfg.Net/Parsers/nanoXML/NanoXmlDocument.cs index 3813234..761bd15 100644 --- a/src/Main/Cfg.Net.Shared/Parsers/nanoXML/NanoXmlDocument.cs +++ b/src/Main/Cfg.Net/Parsers/nanoXML/NanoXmlDocument.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Parsers/nanoXML/NanoXmlNode.cs b/src/Main/Cfg.Net/Parsers/nanoXML/NanoXmlNode.cs similarity index 99% rename from src/Main/Cfg.Net.Shared/Parsers/nanoXML/NanoXmlNode.cs rename to src/Main/Cfg.Net/Parsers/nanoXML/NanoXmlNode.cs index 2a9e3f2..e644066 100644 --- a/src/Main/Cfg.Net.Shared/Parsers/nanoXML/NanoXmlNode.cs +++ b/src/Main/Cfg.Net/Parsers/nanoXML/NanoXmlNode.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Parsers/nanoXML/NanoXmlParsingException.cs b/src/Main/Cfg.Net/Parsers/nanoXML/NanoXmlParsingException.cs similarity index 95% rename from src/Main/Cfg.Net.Shared/Parsers/nanoXML/NanoXmlParsingException.cs rename to src/Main/Cfg.Net/Parsers/nanoXML/NanoXmlParsingException.cs index 8c145df..8ff94f1 100644 --- a/src/Main/Cfg.Net.Shared/Parsers/nanoXML/NanoXmlParsingException.cs +++ b/src/Main/Cfg.Net/Parsers/nanoXML/NanoXmlParsingException.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Serializers/JsonSerializer.cs b/src/Main/Cfg.Net/Serializers/JsonSerializer.cs similarity index 99% rename from src/Main/Cfg.Net.Shared/Serializers/JsonSerializer.cs rename to src/Main/Cfg.Net/Serializers/JsonSerializer.cs index 208726c..ea55a0c 100644 --- a/src/Main/Cfg.Net.Shared/Serializers/JsonSerializer.cs +++ b/src/Main/Cfg.Net/Serializers/JsonSerializer.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Main/Cfg.Net.Shared/Serializers/XmlSerializer.cs b/src/Main/Cfg.Net/Serializers/XmlSerializer.cs similarity index 99% rename from src/Main/Cfg.Net.Shared/Serializers/XmlSerializer.cs rename to src/Main/Cfg.Net/Serializers/XmlSerializer.cs index 61af3e3..9a53e65 100644 --- a/src/Main/Cfg.Net.Shared/Serializers/XmlSerializer.cs +++ b/src/Main/Cfg.Net/Serializers/XmlSerializer.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Parsers/Json.Net/Json.Net.csproj b/src/Parsers/Json.Net/Json.Net.csproj deleted file mode 100644 index 9a2f4a9..0000000 --- a/src/Parsers/Json.Net/Json.Net.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - netstandard2.0 - Cfg.Net.Parsers.Json.Net - Cfg.Net.Parser.Json.Net - 0.15.0-beta - 0.15.0 - 0.15.0 - - - - - - - - - - - diff --git a/src/Parsers/Json/Json.csproj b/src/Parsers/Json/Json.csproj new file mode 100644 index 0000000..1fadc91 --- /dev/null +++ b/src/Parsers/Json/Json.csproj @@ -0,0 +1,27 @@ + + + netstandard2.0 + Cfg.Net.Parsers.Json + Cfg.Net.Parser.Json + 0.16.0-beta + 0.16.0 + 0.16.0 + true + Cfg-NET.Parser.Json + Dale Newman + System.Text.Json parser for Cfg-NET + Copyright 2015-2026 Dale Newman + Apache-2.0 + configuration;cfgnet;json;parser + https://github.com/dalenewman/Cfg-NET + https://github.com/dalenewman/Cfg-NET + git + en-US + + + + + + + + diff --git a/src/Parsers/Json.Net/JsonNetNode.cs b/src/Parsers/Json/JsonNode.cs similarity index 50% rename from src/Parsers/Json.Net/JsonNetNode.cs rename to src/Parsers/Json/JsonNode.cs index e362dd5..307ce63 100644 --- a/src/Parsers/Json.Net/JsonNetNode.cs +++ b/src/Parsers/Json/JsonNode.cs @@ -1,13 +1,13 @@ -// Cfg.Net +// Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2022 Dale Newman -// +// Copyright 2015-2026 Dale Newman +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,53 +15,69 @@ // limitations under the License. using System.Collections.Generic; using System.Linq; +using System.Text.Json; using Cfg.Net.Contracts; -using Newtonsoft.Json.Linq; +using Cfg.Net.Parsers; -namespace Cfg.Net.Parsers.Json.Net { +namespace Cfg.Net.Parsers.Json { - public class JsonNetNode : INode { + public class JsonNode : INode { public string Name { get; } public List Attributes { get; } public List SubNodes { get; } - public JsonNetNode(string name, JObject node) { + public JsonNode(string name, JsonElement element) { Name = name; Attributes = new List(); SubNodes = new List(); - if (node == null) + if (element.ValueKind != JsonValueKind.Object) return; - foreach (var pair in node) { - var key = pair.Key; - var token = pair.Value; - switch (token.Type) { - case JTokenType.Object: + foreach (var property in element.EnumerateObject()) { + var key = property.Name; + var value = property.Value; + switch (value.ValueKind) { + case JsonValueKind.Object: break; - case JTokenType.Property: + case JsonValueKind.Null: break; - case JTokenType.None: + case JsonValueKind.Undefined: break; - case JTokenType.Null: - break; - case JTokenType.Array: - var subNode = new JsonNetNode(key, null); - foreach (var item in (JArray)token) { - subNode.SubNodes.Add(new JsonNetNode("add", (JObject)item)); + case JsonValueKind.Array: + var subNode = new JsonNode(key, default); + foreach (var item in value.EnumerateArray()) { + subNode.SubNodes.Add(new JsonNode("add", item)); } SubNodes.Add(subNode); break; - default: // a value - Attributes.Add(new NodeAttribute() { Name = key, Value = token }); + default: // String, Number, True, False + Attributes.Add(new NodeAttribute() { Name = key, Value = GetValue(value) }); break; } } } + private static object GetValue(JsonElement element) { + switch (element.ValueKind) { + case JsonValueKind.String: + return element.GetString(); + case JsonValueKind.Number: + if (element.TryGetInt64(out var longVal)) + return longVal; + return element.GetDouble(); + case JsonValueKind.True: + return true; + case JsonValueKind.False: + return false; + default: + return element.GetRawText(); + } + } + public bool TryAttribute(string name, out IAttribute attr) { if (Attributes.Any()) { if (Attributes.Exists(a => a.Name == name)) { @@ -73,4 +89,4 @@ public bool TryAttribute(string name, out IAttribute attr) { return false; } } -} \ No newline at end of file +} diff --git a/src/Parsers/Json.Net/JsonNetParser.cs b/src/Parsers/Json/JsonParser.cs similarity index 72% rename from src/Parsers/Json.Net/JsonNetParser.cs rename to src/Parsers/Json/JsonParser.cs index f9f1209..581eb13 100644 --- a/src/Parsers/Json.Net/JsonNetParser.cs +++ b/src/Parsers/Json/JsonParser.cs @@ -1,29 +1,31 @@ -// Cfg.Net +// Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2022 Dale Newman -// +// Copyright 2015-2026 Dale Newman +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +using System.Text.Json; using Cfg.Net.Contracts; -using Newtonsoft.Json.Linq; -namespace Cfg.Net.Parsers.Json.Net { - public class JsonNetParser : IParser { +namespace Cfg.Net.Parsers.Json { + public class JsonParser : IParser { public INode Parse(string cfg) { - return new JsonNetNode("cfg", JObject.Parse(cfg)); + using (var doc = JsonDocument.Parse(cfg)) { + return new JsonNode("cfg", doc.RootElement.Clone()); + } } public string Decode(string value) { return value; } } -} \ No newline at end of file +} diff --git a/src/Parsers/Json.Net/JsonNetSerializer.cs b/src/Parsers/Json/JsonSerializer.cs similarity index 53% rename from src/Parsers/Json.Net/JsonNetSerializer.cs rename to src/Parsers/Json/JsonSerializer.cs index 39890b3..0ffdd68 100644 --- a/src/Parsers/Json.Net/JsonNetSerializer.cs +++ b/src/Parsers/Json/JsonSerializer.cs @@ -1,36 +1,34 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2022 Dale Newman -// +// Copyright 2015-2026 Dale Newman +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +using System.Text.Json; using Cfg.Net.Contracts; -using Newtonsoft.Json; -using Newtonsoft.Json.Serialization; -namespace Cfg.Net.Parsers.Json.Net { - public class JsonNetSerializer : ISerializer { - private readonly JsonSerializerSettings _settings; +namespace Cfg.Net.Parsers.Json { + public class JsonSerializer : ISerializer { + private readonly JsonSerializerOptions _options; - public JsonNetSerializer() { - _settings = new JsonSerializerSettings { - NullValueHandling = NullValueHandling.Ignore, - DateFormatHandling = DateFormatHandling.IsoDateFormat, - ContractResolver = new CamelCasePropertyNamesContractResolver() + public JsonSerializer() { + _options = new JsonSerializerOptions { + DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull, + PropertyNamingPolicy = JsonNamingPolicy.CamelCase }; } + public string Serialize(CfgNode node) { - return JsonConvert.SerializeObject(node, _settings); + return System.Text.Json.JsonSerializer.Serialize(node, _options); } } - -} \ No newline at end of file +} diff --git a/src/Parsers/Xml.Linq/XDocumentNode.cs b/src/Parsers/Xml.Linq/XDocumentNode.cs index 846d311..242206a 100644 --- a/src/Parsers/Xml.Linq/XDocumentNode.cs +++ b/src/Parsers/Xml.Linq/XDocumentNode.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2022 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Parsers/Xml.Linq/XDocumentParser.cs b/src/Parsers/Xml.Linq/XDocumentParser.cs index 4a87ffb..7bb7d70 100644 --- a/src/Parsers/Xml.Linq/XDocumentParser.cs +++ b/src/Parsers/Xml.Linq/XDocumentParser.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2022 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Parsers/Xml.Linq/Xml.Linq.csproj b/src/Parsers/Xml.Linq/Xml.Linq.csproj index ab9f51b..35a4409 100644 --- a/src/Parsers/Xml.Linq/Xml.Linq.csproj +++ b/src/Parsers/Xml.Linq/Xml.Linq.csproj @@ -1,16 +1,24 @@ - - - - netstandard2.0 - Cfg.Net.Parsers.Xml.Linq - Cfg.Net.Parser.Xml.Linq - 0.15.0-beta - 0.15.0 - 0.15.0 - - - - - - + + + netstandard2.0 + Cfg.Net.Parsers.Xml.Linq + Cfg.Net.Parser.Xml.Linq + 0.16.0-beta + 0.16.0 + 0.16.0 + true + Cfg-NET.Parser.Xml.Linq + Dale Newman + Xml.Linq parser for Cfg-NET + Copyright 2015-2026 Dale Newman + Apache-2.0 + configuration;cfgnet;xml;parser + https://github.com/dalenewman/Cfg-NET + https://github.com/dalenewman/Cfg-NET + git + en-US + + + + diff --git a/src/Parsers/YamlDotNet/YamlDotNet.csproj b/src/Parsers/YamlDotNet/YamlDotNet.csproj index a44afbe..a3124d2 100644 --- a/src/Parsers/YamlDotNet/YamlDotNet.csproj +++ b/src/Parsers/YamlDotNet/YamlDotNet.csproj @@ -1,20 +1,27 @@ - - - - netstandard2.0 - Cfg.Net.Parsers.YamlDotNet - Cfg.Net.Parser.YamlDotNet - 0.15.0-beta - 0.15.0 - 0.15.0 - - - - - - - - - - + + + netstandard2.0 + Cfg.Net.Parsers.YamlDotNet + Cfg.Net.Parser.YamlDotNet + 0.16.0-beta + 0.16.0 + 0.16.0 + true + Cfg-NET.Parser.YamlDotNet + Dale Newman + YamlDotNet parser for Cfg-NET + Copyright 2015-2026 Dale Newman + Apache-2.0 + configuration;cfgnet;yaml;parser + https://github.com/dalenewman/Cfg-NET + https://github.com/dalenewman/Cfg-NET + git + en-US + + + + + + + diff --git a/src/Parsers/YamlDotNet/YamlDotNetNode.cs b/src/Parsers/YamlDotNet/YamlDotNetNode.cs index 4e905f8..7483442 100644 --- a/src/Parsers/YamlDotNet/YamlDotNetNode.cs +++ b/src/Parsers/YamlDotNet/YamlDotNetNode.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Parsers/YamlDotNet/YamlDotNetParser.cs b/src/Parsers/YamlDotNet/YamlDotNetParser.cs index 1246fcb..e32ae0f 100644 --- a/src/Parsers/YamlDotNet/YamlDotNetParser.cs +++ b/src/Parsers/YamlDotNet/YamlDotNetParser.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Parsers/YamlDotNet/YamlDotNetSerializer.cs b/src/Parsers/YamlDotNet/YamlDotNetSerializer.cs index a04a978..dc74e82 100644 --- a/src/Parsers/YamlDotNet/YamlDotNetSerializer.cs +++ b/src/Parsers/YamlDotNet/YamlDotNetSerializer.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Readers/Default/Cfg.Net.Reader.Shared/Cfg.Net.Reader.Shared.projitems b/src/Readers/Default/Cfg.Net.Reader.Shared/Cfg.Net.Reader.Shared.projitems deleted file mode 100644 index c0a45e7..0000000 --- a/src/Readers/Default/Cfg.Net.Reader.Shared/Cfg.Net.Reader.Shared.projitems +++ /dev/null @@ -1,19 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - c76fc002-10fd-4a69-af1a-1c9260ec6807 - - - Cfg.Net.Reader.Shared - - - - - - - - - - \ No newline at end of file diff --git a/src/Readers/Default/Cfg.Net.Reader.Shared/Cfg.Net.Reader.Shared.shproj b/src/Readers/Default/Cfg.Net.Reader.Shared/Cfg.Net.Reader.Shared.shproj deleted file mode 100644 index be5c761..0000000 --- a/src/Readers/Default/Cfg.Net.Reader.Shared/Cfg.Net.Reader.Shared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - c76fc002-10fd-4a69-af1a-1c9260ec6807 - 14.0 - - - - - - - - diff --git a/src/Readers/Default/Cfg.Net.Reader.Standard.20/Cfg.Net.Reader.Standard.20.csproj b/src/Readers/Default/Cfg.Net.Reader.Standard.20/Cfg.Net.Reader.Standard.20.csproj deleted file mode 100644 index 5406499..0000000 --- a/src/Readers/Default/Cfg.Net.Reader.Standard.20/Cfg.Net.Reader.Standard.20.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netstandard2.0 - Cfg.Net.Reader - Cfg.Net.Reader - 0.15.0-beta - 0.15.0 - 0.15.0 - - - - - - - - - diff --git a/src/Readers/Default/Cfg.Net.Reader.Standard.21/Cfg.Net.Reader.Standard.21.csproj b/src/Readers/Default/Cfg.Net.Reader.Standard.21/Cfg.Net.Reader.Standard.21.csproj deleted file mode 100644 index c411f46..0000000 --- a/src/Readers/Default/Cfg.Net.Reader.Standard.21/Cfg.Net.Reader.Standard.21.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netstandard2.1 - Cfg.Net.Reader - Cfg.Net.Reader - 0.15.0-beta - 0.15.0 - 0.15.0 - - - - - - - - - diff --git a/src/Readers/Default/Cfg.Net.Reader/Cfg.Net.Reader.csproj b/src/Readers/Default/Cfg.Net.Reader/Cfg.Net.Reader.csproj new file mode 100644 index 0000000..ab5da0d --- /dev/null +++ b/src/Readers/Default/Cfg.Net.Reader/Cfg.Net.Reader.csproj @@ -0,0 +1,24 @@ + + + netstandard2.0;netstandard2.1 + Cfg.Net.Reader + Cfg.Net.Reader + 0.16.0-beta + 0.16.0 + 0.16.0 + true + Cfg-NET.Reader + Dale Newman + default file and web reader for Cfg-NET + Copyright 2015-2026 Dale Newman + Apache-2.0 + configuration;cfgnet;reader + https://github.com/dalenewman/Cfg-NET + https://github.com/dalenewman/Cfg-NET + git + en-US + + + + + diff --git a/src/Readers/Default/Cfg.Net.Reader.Shared/DefaultReader.cs b/src/Readers/Default/Cfg.Net.Reader/DefaultReader.cs similarity index 98% rename from src/Readers/Default/Cfg.Net.Reader.Shared/DefaultReader.cs rename to src/Readers/Default/Cfg.Net.Reader/DefaultReader.cs index 5e92f7e..e0ce09c 100644 --- a/src/Readers/Default/Cfg.Net.Reader.Shared/DefaultReader.cs +++ b/src/Readers/Default/Cfg.Net.Reader/DefaultReader.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Readers/Default/Cfg.Net.Reader.Shared/FileFinder.cs b/src/Readers/Default/Cfg.Net.Reader/FileFinder.cs similarity index 100% rename from src/Readers/Default/Cfg.Net.Reader.Shared/FileFinder.cs rename to src/Readers/Default/Cfg.Net.Reader/FileFinder.cs diff --git a/src/Readers/Default/Cfg.Net.Reader.Shared/FileReader.cs b/src/Readers/Default/Cfg.Net.Reader/FileReader.cs similarity index 98% rename from src/Readers/Default/Cfg.Net.Reader.Shared/FileReader.cs rename to src/Readers/Default/Cfg.Net.Reader/FileReader.cs index f155567..83445db 100644 --- a/src/Readers/Default/Cfg.Net.Reader.Shared/FileReader.cs +++ b/src/Readers/Default/Cfg.Net.Reader/FileReader.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Readers/Default/Cfg.Net.Reader.Shared/HttpUtility.cs b/src/Readers/Default/Cfg.Net.Reader/HttpUtility.cs similarity index 99% rename from src/Readers/Default/Cfg.Net.Reader.Shared/HttpUtility.cs rename to src/Readers/Default/Cfg.Net.Reader/HttpUtility.cs index d83ab91..e040b85 100644 --- a/src/Readers/Default/Cfg.Net.Reader.Shared/HttpUtility.cs +++ b/src/Readers/Default/Cfg.Net.Reader/HttpUtility.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Readers/Default/Cfg.Net.Reader.Shared/ReTryingReader.cs b/src/Readers/Default/Cfg.Net.Reader/ReTryingReader.cs similarity index 98% rename from src/Readers/Default/Cfg.Net.Reader.Shared/ReTryingReader.cs rename to src/Readers/Default/Cfg.Net.Reader/ReTryingReader.cs index 16987ff..5bf165c 100644 --- a/src/Readers/Default/Cfg.Net.Reader.Shared/ReTryingReader.cs +++ b/src/Readers/Default/Cfg.Net.Reader/ReTryingReader.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Readers/Default/Cfg.Net.Reader.Shared/WebReader.cs b/src/Readers/Default/Cfg.Net.Reader/WebReader.cs similarity index 98% rename from src/Readers/Default/Cfg.Net.Reader.Shared/WebReader.cs rename to src/Readers/Default/Cfg.Net.Reader/WebReader.cs index 070cc98..23ccc63 100644 --- a/src/Readers/Default/Cfg.Net.Reader.Shared/WebReader.cs +++ b/src/Readers/Default/Cfg.Net.Reader/WebReader.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2018 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Readers/FileSystemWatcherReader/FileSystemWatcherReader.Standard.20/FileFinder.cs b/src/Readers/FileSystemWatcherReader/FileFinder.cs similarity index 100% rename from src/Readers/FileSystemWatcherReader/FileSystemWatcherReader.Standard.20/FileFinder.cs rename to src/Readers/FileSystemWatcherReader/FileFinder.cs diff --git a/src/Readers/FileSystemWatcherReader/FileSystemWatcherReader.Standard.20/FileSystemWatcherReader.Standard.20.csproj b/src/Readers/FileSystemWatcherReader/FileSystemWatcherReader.Standard.20/FileSystemWatcherReader.Standard.20.csproj deleted file mode 100644 index 5edf034..0000000 --- a/src/Readers/FileSystemWatcherReader/FileSystemWatcherReader.Standard.20/FileSystemWatcherReader.Standard.20.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netstandard2.0 - Cfg.Net.Readers.FileSystemWatcherReader - Cfg.Net.Readers.FileSystemWatcherReader - 0.15.0-beta - 0.15.0 - 0.15.0 - - - - - - - diff --git a/src/Readers/FileSystemWatcherReader/FileSystemWatcherReader.Standard.20/FileSystemWatcherReader.cs b/src/Readers/FileSystemWatcherReader/FileSystemWatcherReader.cs similarity index 100% rename from src/Readers/FileSystemWatcherReader/FileSystemWatcherReader.Standard.20/FileSystemWatcherReader.cs rename to src/Readers/FileSystemWatcherReader/FileSystemWatcherReader.cs diff --git a/src/Readers/FileSystemWatcherReader/FileSystemWatcherReader.csproj b/src/Readers/FileSystemWatcherReader/FileSystemWatcherReader.csproj new file mode 100644 index 0000000..ca11d3b --- /dev/null +++ b/src/Readers/FileSystemWatcherReader/FileSystemWatcherReader.csproj @@ -0,0 +1,24 @@ + + + netstandard2.0 + Cfg.Net.Readers.FileSystemWatcherReader + Cfg.Net.Readers.FileSystemWatcherReader + 0.16.0-beta + 0.16.0 + 0.16.0 + true + Cfg-NET.Readers.FileSystemWatcherReader + Dale Newman + file system watcher reader for Cfg-NET configuration reloading + Copyright 2015-2026 Dale Newman + Apache-2.0 + configuration;cfgnet;reader;filesystemwatcher + https://github.com/dalenewman/Cfg-NET + https://github.com/dalenewman/Cfg-NET + git + en-US + + + + + diff --git a/src/Readers/FileSystemWatcherReader/FileSystemWatcherReader.Standard.20/HttpUtility.cs b/src/Readers/FileSystemWatcherReader/HttpUtility.cs similarity index 99% rename from src/Readers/FileSystemWatcherReader/FileSystemWatcherReader.Standard.20/HttpUtility.cs rename to src/Readers/FileSystemWatcherReader/HttpUtility.cs index a5138ac..998b60f 100644 --- a/src/Readers/FileSystemWatcherReader/FileSystemWatcherReader.Standard.20/HttpUtility.cs +++ b/src/Readers/FileSystemWatcherReader/HttpUtility.cs @@ -1,6 +1,6 @@ // Cfg.Net // An Alternative .NET Configuration Handler -// Copyright 2015-2019 Dale Newman +// Copyright 2015-2026 Dale Newman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License.