From 905f32057363d8c870087a69e26518f0fbc98bb8 Mon Sep 17 00:00:00 2001 From: Fanie Reynders Date: Mon, 28 Jan 2019 12:15:08 +0100 Subject: [PATCH 1/6] added new project-level cli tool to support DotNetCliToolReference --- .../XmlSchemaClassGenerator.csproj | 2 +- dotnet-xscgen/dotnet-xscgen.csproj | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 dotnet-xscgen/dotnet-xscgen.csproj diff --git a/XmlSchemaClassGenerator/XmlSchemaClassGenerator.csproj b/XmlSchemaClassGenerator/XmlSchemaClassGenerator.csproj index 1cdd7f36..5a4f2c18 100644 --- a/XmlSchemaClassGenerator/XmlSchemaClassGenerator.csproj +++ b/XmlSchemaClassGenerator/XmlSchemaClassGenerator.csproj @@ -6,7 +6,7 @@ XmlSchemaClassGenerator 1.0.0-VERSION Michael Ganss - net45;netstandard2.0 + netstandard2.0;net45 XmlSchemaClassGenerator XmlSchemaClassGenerator-beta xsd diff --git a/dotnet-xscgen/dotnet-xscgen.csproj b/dotnet-xscgen/dotnet-xscgen.csproj new file mode 100644 index 00000000..ea16edb4 --- /dev/null +++ b/dotnet-xscgen/dotnet-xscgen.csproj @@ -0,0 +1,34 @@ + + + Exe + netcoreapp2.1 + A .NET Core CLI tool to generate XmlSerializer compatible C# classes from XML Schema files. + Copyright 2013-2018 Michael Ganss + xscgen + 1.0.0 + dotnet-xscgen + XmlSchemaClassGenerator.Console + Michael Ganss + dotnet-xscgen-csproj + xsd xmlschema generator + https://github.com/mganss/XmlSchemaClassGenerator + https://github.com/mganss/XmlSchemaClassGenerator/blob/master/LICENSE + git + git://github.com/mganss/XmlSchemaClassGenerator + dotnet-xscgen + $(DefineConstants);NETSTANDARD + + + + + + + + + + + + + true + + From 000b81f2c499dc9d7dbb0e3cf42b1b5a5d177118 Mon Sep 17 00:00:00 2001 From: Fanie Reynders Date: Mon, 28 Jan 2019 12:23:05 +0100 Subject: [PATCH 2/6] made changes to include the new project in appveyor --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index e4b37b8c..d28b844c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,6 +12,7 @@ build_script: - ps: (Get-Content XmlSchemaClassGenerator\XmlSchemaClassGenerator.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content XmlSchemaClassGenerator\XmlSchemaClassGenerator.csproj - ps: (Get-Content XmlSchemaClassGenerator.Console\XmlSchemaClassGenerator.Console.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content XmlSchemaClassGenerator.Console\XmlSchemaClassGenerator.Console.csproj - ps: (Get-Content xscgen\xscgen.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content xscgen\xscgen.csproj + - ps: (Get-Content xscgen\dotnet-xscgen.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content dotnet-xscgen\dotnet-xscgen.csproj - dotnet --info - dotnet restore - dotnet build -c Release @@ -19,6 +20,7 @@ build_script: - dotnet pack --include-symbols --include-source -c Release XmlSchemaClassGenerator - dotnet pack --include-symbols --include-source -c Release XmlSchemaClassGenerator.Console - dotnet pack --include-symbols --include-source -c Release xscgen + - dotnet pack --include-symbols --include-source -c Release xscgen-csproj - 7z a -mx=9 XmlSchemaClassGenerator.%APPVEYOR_BUILD_VERSION%.zip ".\XmlSchemaClassGenerator.Console\bin\Release\net45\publish\*" test_script: - ps: | @@ -38,6 +40,7 @@ artifacts: - path: 'XmlSchemaClassGenerator\**\*.nupkg' - path: 'XmlSchemaClassGenerator.Console\**\*.nupkg' - path: 'xscgen\**\*.nupkg' + - path: 'xscgen-csproj\**\*.nupkg' - path: XmlSchemaClassGenerator.%APPVEYOR_BUILD_VERSION%.zip on_success: - ps: | From 9b37b5fe24e313b303f557748613affa1bfc3826 Mon Sep 17 00:00:00 2001 From: Fanie Reynders Date: Mon, 28 Jan 2019 12:25:55 +0100 Subject: [PATCH 3/6] typo --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index d28b844c..8e647f8c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ build_script: - ps: (Get-Content XmlSchemaClassGenerator\XmlSchemaClassGenerator.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content XmlSchemaClassGenerator\XmlSchemaClassGenerator.csproj - ps: (Get-Content XmlSchemaClassGenerator.Console\XmlSchemaClassGenerator.Console.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content XmlSchemaClassGenerator.Console\XmlSchemaClassGenerator.Console.csproj - ps: (Get-Content xscgen\xscgen.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content xscgen\xscgen.csproj - - ps: (Get-Content xscgen\dotnet-xscgen.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content dotnet-xscgen\dotnet-xscgen.csproj + - ps: (Get-Content xscgen-csproj\dotnet-xscgen.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content dotnet-xscgen\dotnet-xscgen.csproj - dotnet --info - dotnet restore - dotnet build -c Release From df2feee9900a42af002a0c0a595413762c525cd5 Mon Sep 17 00:00:00 2001 From: Fanie Reynders Date: Mon, 28 Jan 2019 12:29:55 +0100 Subject: [PATCH 4/6] another typo :) --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 8e647f8c..5f08feda 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ build_script: - ps: (Get-Content XmlSchemaClassGenerator\XmlSchemaClassGenerator.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content XmlSchemaClassGenerator\XmlSchemaClassGenerator.csproj - ps: (Get-Content XmlSchemaClassGenerator.Console\XmlSchemaClassGenerator.Console.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content XmlSchemaClassGenerator.Console\XmlSchemaClassGenerator.Console.csproj - ps: (Get-Content xscgen\xscgen.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content xscgen\xscgen.csproj - - ps: (Get-Content xscgen-csproj\dotnet-xscgen.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content dotnet-xscgen\dotnet-xscgen.csproj + - ps: (Get-Content dotnet-xscgen\dotnet-xscgen.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content dotnet-xscgen\dotnet-xscgen.csproj - dotnet --info - dotnet restore - dotnet build -c Release From 817404488c00c377db4672c085ed718570e7eb09 Mon Sep 17 00:00:00 2001 From: Fanie Reynders Date: Mon, 28 Jan 2019 12:35:04 +0100 Subject: [PATCH 5/6] fixed path bug --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5f08feda..10835874 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,7 +20,7 @@ build_script: - dotnet pack --include-symbols --include-source -c Release XmlSchemaClassGenerator - dotnet pack --include-symbols --include-source -c Release XmlSchemaClassGenerator.Console - dotnet pack --include-symbols --include-source -c Release xscgen - - dotnet pack --include-symbols --include-source -c Release xscgen-csproj + - dotnet pack --include-symbols --include-source -c Release dotnet-xscgen - 7z a -mx=9 XmlSchemaClassGenerator.%APPVEYOR_BUILD_VERSION%.zip ".\XmlSchemaClassGenerator.Console\bin\Release\net45\publish\*" test_script: - ps: | @@ -40,7 +40,7 @@ artifacts: - path: 'XmlSchemaClassGenerator\**\*.nupkg' - path: 'XmlSchemaClassGenerator.Console\**\*.nupkg' - path: 'xscgen\**\*.nupkg' - - path: 'xscgen-csproj\**\*.nupkg' + - path: 'dotnet-xscgen\**\*.nupkg' - path: XmlSchemaClassGenerator.%APPVEYOR_BUILD_VERSION%.zip on_success: - ps: | From 1fe6ac99612d1e76a89080772616ccf716e39cc2 Mon Sep 17 00:00:00 2001 From: Fanie Reynders Date: Thu, 31 Jan 2019 09:14:07 +0100 Subject: [PATCH 6/6] changed naming to conform to the standard of the solution --- appveyor.yml | 6 +++--- .../dotnet-xscgen.csproj => xscgen-proj/xscgen-proj.csproj | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename dotnet-xscgen/dotnet-xscgen.csproj => xscgen-proj/xscgen-proj.csproj (97%) diff --git a/appveyor.yml b/appveyor.yml index 10835874..f7d0eb75 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ build_script: - ps: (Get-Content XmlSchemaClassGenerator\XmlSchemaClassGenerator.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content XmlSchemaClassGenerator\XmlSchemaClassGenerator.csproj - ps: (Get-Content XmlSchemaClassGenerator.Console\XmlSchemaClassGenerator.Console.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content XmlSchemaClassGenerator.Console\XmlSchemaClassGenerator.Console.csproj - ps: (Get-Content xscgen\xscgen.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content xscgen\xscgen.csproj - - ps: (Get-Content dotnet-xscgen\dotnet-xscgen.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content dotnet-xscgen\dotnet-xscgen.csproj + - ps: (Get-Content xscgen-proj\xscgen-proj.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content xscgen-proj\xscgen-proj.csproj - dotnet --info - dotnet restore - dotnet build -c Release @@ -20,7 +20,7 @@ build_script: - dotnet pack --include-symbols --include-source -c Release XmlSchemaClassGenerator - dotnet pack --include-symbols --include-source -c Release XmlSchemaClassGenerator.Console - dotnet pack --include-symbols --include-source -c Release xscgen - - dotnet pack --include-symbols --include-source -c Release dotnet-xscgen + - dotnet pack --include-symbols --include-source -c Release xscgen-proj - 7z a -mx=9 XmlSchemaClassGenerator.%APPVEYOR_BUILD_VERSION%.zip ".\XmlSchemaClassGenerator.Console\bin\Release\net45\publish\*" test_script: - ps: | @@ -40,7 +40,7 @@ artifacts: - path: 'XmlSchemaClassGenerator\**\*.nupkg' - path: 'XmlSchemaClassGenerator.Console\**\*.nupkg' - path: 'xscgen\**\*.nupkg' - - path: 'dotnet-xscgen\**\*.nupkg' + - path: 'xscgen-proj\**\*.nupkg' - path: XmlSchemaClassGenerator.%APPVEYOR_BUILD_VERSION%.zip on_success: - ps: | diff --git a/dotnet-xscgen/dotnet-xscgen.csproj b/xscgen-proj/xscgen-proj.csproj similarity index 97% rename from dotnet-xscgen/dotnet-xscgen.csproj rename to xscgen-proj/xscgen-proj.csproj index ea16edb4..eddf8453 100644 --- a/dotnet-xscgen/dotnet-xscgen.csproj +++ b/xscgen-proj/xscgen-proj.csproj @@ -9,7 +9,7 @@ dotnet-xscgen XmlSchemaClassGenerator.Console Michael Ganss - dotnet-xscgen-csproj + dotnet-xscgen-proj xsd xmlschema generator https://github.com/mganss/XmlSchemaClassGenerator https://github.com/mganss/XmlSchemaClassGenerator/blob/master/LICENSE