diff --git a/XmlResolver.sln b/XmlResolver.sln deleted file mode 100644 index b5219d5..0000000 --- a/XmlResolver.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlResolver", "XmlResolver\XmlResolver.csproj", "{B347954F-8FC1-49A1-AF2E-1C46F030B8AC}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{EB15F220-858B-4661-B5E1-25BAE467B77D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleApp", "SampleApp\SampleApp.csproj", "{44D45D23-B2A1-4EF2-B838-6B019FE1C7FF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B347954F-8FC1-49A1-AF2E-1C46F030B8AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B347954F-8FC1-49A1-AF2E-1C46F030B8AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B347954F-8FC1-49A1-AF2E-1C46F030B8AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B347954F-8FC1-49A1-AF2E-1C46F030B8AC}.Release|Any CPU.Build.0 = Release|Any CPU - {EB15F220-858B-4661-B5E1-25BAE467B77D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB15F220-858B-4661-B5E1-25BAE467B77D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB15F220-858B-4661-B5E1-25BAE467B77D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB15F220-858B-4661-B5E1-25BAE467B77D}.Release|Any CPU.Build.0 = Release|Any CPU - {44D45D23-B2A1-4EF2-B838-6B019FE1C7FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44D45D23-B2A1-4EF2-B838-6B019FE1C7FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44D45D23-B2A1-4EF2-B838-6B019FE1C7FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44D45D23-B2A1-4EF2-B838-6B019FE1C7FF}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/XmlResolver.slnf b/XmlResolver.slnf new file mode 100644 index 0000000..128d629 --- /dev/null +++ b/XmlResolver.slnf @@ -0,0 +1,10 @@ +{ + "solution": { + "path": "XmlResolver.slnx", + "projects": [ + "SampleApp\\SampleApp.csproj", + "UnitTests\\UnitTests.csproj", + "XmlResolver\\XmlResolver.csproj" + ] + } +} \ No newline at end of file diff --git a/XmlResolver.slnx b/XmlResolver.slnx new file mode 100644 index 0000000..ca1d222 --- /dev/null +++ b/XmlResolver.slnx @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/XmlResolver/XmlResolver.csproj b/XmlResolver/XmlResolver.csproj index 24ea6a7..cbc7455 100644 --- a/XmlResolver/XmlResolver.csproj +++ b/XmlResolver/XmlResolver.csproj @@ -8,7 +8,7 @@ Norman Walsh The xmlresolver project provides an implementation of the System.Xml.XmlResolver. It uses the OASIS XML Catalogs V1.1 Standard to provide a mapping from external identifiers and URIs to local resources. XML,XmlResolver - Copyright © 2021-2025 Norman Walsh. Portions Copyright © 2022-2025 Saxonica, Ltd. + Copyright © 2021-2026 Norman Walsh. Portions Copyright © 2022-2026 Saxonica, Ltd. MIT https://xmlresolver.org/ https://github.com/xmlresolver/xmlresolvercs diff --git a/XmlResolverData.sln b/XmlResolverData.sln deleted file mode 100644 index 6984237..0000000 --- a/XmlResolverData.sln +++ /dev/null @@ -1,22 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlResolverData", "XmlResolverData\XmlResolverData.csproj", "{01D4B0FF-2906-4414-83C6-F7C11A451EF2}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTests", "DataTests\DataTests.csproj", "{1CD974F3-C9CD-4018-A4D1-6E3F57AD693B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {01D4B0FF-2906-4414-83C6-F7C11A451EF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01D4B0FF-2906-4414-83C6-F7C11A451EF2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01D4B0FF-2906-4414-83C6-F7C11A451EF2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01D4B0FF-2906-4414-83C6-F7C11A451EF2}.Release|Any CPU.Build.0 = Release|Any CPU - {1CD974F3-C9CD-4018-A4D1-6E3F57AD693B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1CD974F3-C9CD-4018-A4D1-6E3F57AD693B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1CD974F3-C9CD-4018-A4D1-6E3F57AD693B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1CD974F3-C9CD-4018-A4D1-6E3F57AD693B}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/XmlResolverData.slnf b/XmlResolverData.slnf new file mode 100644 index 0000000..511a526 --- /dev/null +++ b/XmlResolverData.slnf @@ -0,0 +1,9 @@ +{ + "solution": { + "path": "XmlResolver.slnx", + "projects": [ + "DataTests\\DataTests.csproj", + "XmlResolverData\\XmlResolverData.csproj", + ] + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index cd9aa72..7160b65 100644 --- a/build.gradle +++ b/build.gradle @@ -130,13 +130,13 @@ tasks.register("dotnetBuildXmlResolver") { doLast { exec { workingDir = projectDir - commandLine dotnetex, 'restore', 'XmlResolver.sln', '--verbosity', 'Normal' + commandLine dotnetex, 'restore', 'XmlResolver.slnf', '--verbosity', 'Normal' } } doLast { exec { workingDir = projectDir - commandLine dotnetex, 'build', 'XmlResolver.sln', '--verbosity', 'Normal', + commandLine dotnetex, 'build', 'XmlResolver.slnf', '--verbosity', 'Normal', '--configuration', 'Release', '/nodereuse:false', '--no-restore', "-p:Version=${resolverVersion}", "-p:PackageVersion=${resolverVersion}" } @@ -152,13 +152,13 @@ tasks.register("dotnetBuildXmlResolverData") { doLast { exec { workingDir = projectDir - commandLine dotnetex, 'restore', 'XmlResolverData.sln', '--verbosity', 'Normal' + commandLine dotnetex, 'restore', 'XmlResolverData.slnf', '--verbosity', 'Normal' } } doLast { exec { workingDir = projectDir - commandLine dotnetex, 'build', 'XmlResolverData.sln', '--verbosity', 'Normal', + commandLine dotnetex, 'build', 'XmlResolverData.slnf', '--verbosity', 'Normal', '--configuration', 'Release', '/nodereuse:false', '--no-restore', "-p:Version=${resolverVersion}", "-p:PackageVersion=${resolverVersion}" } @@ -175,7 +175,7 @@ tasks.register("dotnetTestXmlResolver") { exec { workingDir = projectDir environment "CSHARP_XMLRESOLVER_PATH", projectDir - commandLine dotnetex, 'test', 'XmlResolver.sln', + commandLine dotnetex, 'test', 'XmlResolver.slnf', '--verbosity', 'Normal', '--configuration', 'Release', '--no-build', '/p:CollectCoverage=true', @@ -196,7 +196,7 @@ tasks.register("dotnetNugetPush") { doLast { exec { workingDir = projectDir - commandLine dotnetex, "restore", "XmlResolver.sln", "--verbosity", "Normal" + commandLine dotnetex, "restore", "XmlResolver.slnf", "--verbosity", "Normal" } } @@ -212,7 +212,7 @@ tasks.register("dotnetNugetPush") { doLast { exec { workingDir = projectDir - commandLine dotnetex, "restore", "XmlResolverData.sln", "--verbosity", "Normal" + commandLine dotnetex, "restore", "XmlResolverData.slnf", "--verbosity", "Normal" } } diff --git a/tools/make-csproj.xsl b/tools/make-csproj.xsl index 8ad2f39..ee4655b 100644 --- a/tools/make-csproj.xsl +++ b/tools/make-csproj.xsl @@ -21,7 +21,7 @@ https://xmlresolver.org/ https://github.com/xmlresolver/xmlresolverdata git - Experimental release. Probably buggy. Caveat emptor. + Standard resources for the catalog-based XML Resolver API for .NETThis is a standard set of useful XML resources for use with the XML Resolver.