Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions XmlResolver.sln

This file was deleted.

10 changes: 10 additions & 0 deletions XmlResolver.slnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"solution": {
"path": "XmlResolver.slnx",
"projects": [
"SampleApp\\SampleApp.csproj",
"UnitTests\\UnitTests.csproj",
"XmlResolver\\XmlResolver.csproj"
]
}
}
9 changes: 9 additions & 0 deletions XmlResolver.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Solution>
<Folder Name="/Test/">
<Project Path="DataTests/DataTests.csproj" />
<Project Path="UnitTests/UnitTests.csproj" />
<Project Path="SampleApp/SampleApp.csproj" />
</Folder>
<Project Path="XmlResolver/XmlResolver.csproj" />
<Project Path="XmlResolverData/XmlResolverData.csproj" />
</Solution>
2 changes: 1 addition & 1 deletion XmlResolver/XmlResolver.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Authors>Norman Walsh</Authors>
<Description>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.</Description>
<PackageTags>XML,XmlResolver</PackageTags>
<Copyright>Copyright © 2021-2025 Norman Walsh. Portions Copyright © 2022-2025 Saxonica, Ltd.</Copyright>
<Copyright>Copyright © 2021-2026 Norman Walsh. Portions Copyright © 2022-2026 Saxonica, Ltd.</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://xmlresolver.org/</PackageProjectUrl>
<RepositoryUrl>https://github.com/xmlresolver/xmlresolvercs</RepositoryUrl>
Expand Down
22 changes: 0 additions & 22 deletions XmlResolverData.sln

This file was deleted.

9 changes: 9 additions & 0 deletions XmlResolverData.slnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"solution": {
"path": "XmlResolver.slnx",
"projects": [
"DataTests\\DataTests.csproj",
"XmlResolverData\\XmlResolverData.csproj",
]
}
}
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}
Expand All @@ -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}"
}
Expand All @@ -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',
Expand All @@ -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"
}
}

Expand All @@ -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"
}
}

Expand Down
2 changes: 1 addition & 1 deletion tools/make-csproj.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PackageProjectUrl>https://xmlresolver.org/</PackageProjectUrl>
<RepositoryUrl>https://github.com/xmlresolver/xmlresolverdata</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageReleaseNotes>Experimental release. Probably buggy. Caveat emptor.</PackageReleaseNotes>
<PackageReleaseNotes>Standard resources for the catalog-based XML Resolver API for .NET</PackageReleaseNote
<PackageSummary>This is a standard set of useful XML resources for use with the XML Resolver.</PackageSummary>
</PropertyGroup>

Expand Down