Skip to content

Commit 5806f9b

Browse files
committed
IMPORTANT: GNU 3.0 license was replaced with Apache 2.0 in ALL files
* SgmlParser.cs: removed variables that were assigned to, but never used * SgmlReader.cs: removed variables that were assigned to, but never used
1 parent 5edf523 commit 5806f9b

12 files changed

+377
-772
lines changed

CommandLine/AssemblyInfo.cs

+25-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
/*
2+
*
3+
* Copyright (c) 2007-2013 MindTouch. All rights reserved.
4+
* www.mindtouch.com [email protected]
5+
*
6+
* For community documentation and downloads visit wiki.developer.mindtouch.com;
7+
* please review the licensing section.
8+
*
9+
* Licensed under the Apache License, Version 2.0 (the "License");
10+
* you may not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS,
17+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
20+
*
21+
*/
22+
123
using System;
224
using System.Reflection;
325
using System.Runtime.CompilerServices;
@@ -12,7 +34,7 @@
1234
[assembly: AssemblyConfiguration("")]
1335
[assembly: AssemblyCompany("Microsoft")]
1436
[assembly: AssemblyProduct("")]
15-
[assembly: AssemblyCopyright("Copyright © 2002, Microsoft Corporation")]
37+
[assembly: AssemblyCopyright("Copyright (c) 2002, Microsoft Corporation; Copyright (c) 2007-2013, MindTouch")]
1638
[assembly: AssemblyTrademark("")]
1739
[assembly: AssemblyCulture("")]
1840
[assembly: CLSCompliant(true)]
@@ -28,8 +50,8 @@
2850
// You can specify all the values or you can default the Revision and Build Numbers
2951
// by using the '*' as shown below:
3052

31-
[assembly: AssemblyVersion("1.8.8.*")]
32-
[assembly: AssemblyFileVersion("1.8.8.*")]
53+
[assembly: AssemblyVersion("1.8.8")]
54+
[assembly: AssemblyFileVersion("1.8.8")]
3355

3456
//
3557
// In order to sign your assembly you must specify a key to use. Refer to the

CommandLine/Main.cs

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
/*
22
*
3-
* Copyright (c) 2007-2011 MindTouch. All rights reserved.
3+
* Copyright (c) 2007-2013 MindTouch. All rights reserved.
44
* www.mindtouch.com [email protected]
55
*
6-
* This program is free software: you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation, either version 3 of the License, or
9-
* (at your option) any later version.
6+
* For community documentation and downloads visit wiki.developer.mindtouch.com;
7+
* please review the licensing section.
108
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
16-
* You should have received a copy of the GNU General Public License
17-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
9+
* Licensed under the Apache License, Version 2.0 (the "License");
10+
* you may not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS,
17+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
1820
*
1921
*/
2022

SGMLReader.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<id>SgmlReader</id>
55
<version>1.8.8</version>
66
<authors>Chris Lovett, Steve Bjorg</authors>
7-
<owners>Andy Sherwood</owners>
7+
<owners>Steve Bjorg, Andy Sherwood</owners>
88
<licenseUrl>https://github.com/MindTouch/SGMLReader/blob/master/license.txt</licenseUrl>
99
<projectUrl>https://github.com/MindTouch/SGMLReader</projectUrl>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1111
<summary>Converts SGML to XML via XmlReader API</summary>
1212
<description>SGMLReader is a versatile C# .NET library written by Chris Lovett for parsing HTML/SGML files. The original community around SGMLReader used to be hosted by GotDotNet, but this site was phased out (update: it appears the code has re-surfaced on MSDN Code Gallery, but without any updates). MindTouch Dream and MindTouch Core use the SGMLReader library extensively. Over the last few years we have made many improvements to this code; thereby, making us the de facto maintainers of this library. In the spirit of the original author, we're providing back these changes on the MindTouch Developer Center site.</description>
1313
<tags>SGML XML</tags>
14-
<copyright>Copyright © 2002, Microsoft Corporation; Copyright © 2007-2008, MindTouch</copyright>
14+
<copyright>Copyright © 2002, Microsoft Corporation; Copyright © 2007-2013, MindTouch</copyright>
1515
</metadata>
1616
</package>

SGMLTests/AssemblyInfo.cs

+25-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,37 @@
1+
/*
2+
*
3+
* Copyright (c) 2007-2013 MindTouch. All rights reserved.
4+
* www.mindtouch.com [email protected]
5+
*
6+
* For community documentation and downloads visit wiki.developer.mindtouch.com;
7+
* please review the licensing section.
8+
*
9+
* Licensed under the Apache License, Version 2.0 (the "License");
10+
* you may not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS,
17+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
20+
*
21+
*/
22+
123
using System.Reflection;
224
using System.Runtime.CompilerServices;
325

426
// Information about this assembly is defined by the following attributes.
527
// Change them to the values specific to your project.
628

729
[assembly: AssemblyTitle("SGMLTests")]
8-
[assembly: AssemblyDescription("")]
30+
[assembly: AssemblyDescription("Unit tests for SgmlReaderDll")]
931
[assembly: AssemblyConfiguration("")]
10-
[assembly: AssemblyCompany("")]
32+
[assembly: AssemblyCompany("MindTouch")]
1133
[assembly: AssemblyProduct("")]
12-
[assembly: AssemblyCopyright("")]
34+
[assembly: AssemblyCopyright("Copyright (c) 2007-2013, MindTouch")]
1335
[assembly: AssemblyTrademark("")]
1436
[assembly: AssemblyCulture("")]
1537

SGMLTests/LoggingXmlReader.cs

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
/*
22
*
3-
* Copyright (c) 2007-2011 MindTouch. All rights reserved.
3+
* Copyright (c) 2007-2013 MindTouch. All rights reserved.
44
* www.mindtouch.com [email protected]
55
*
6-
* This program is free software: you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation, either version 3 of the License, or
9-
* (at your option) any later version.
6+
* For community documentation and downloads visit wiki.developer.mindtouch.com;
7+
* please review the licensing section.
108
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
16-
* You should have received a copy of the GNU General Public License
17-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
9+
* Licensed under the Apache License, Version 2.0 (the "License");
10+
* you may not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS,
17+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
1820
*
1921
*/
2022

SGMLTests/Tests-Logic.cs

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
/*
22
*
3-
* Copyright (c) 2007-2011 MindTouch. All rights reserved.
3+
* Copyright (c) 2007-2013 MindTouch. All rights reserved.
44
* www.mindtouch.com [email protected]
55
*
6-
* This program is free software: you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation, either version 3 of the License, or
9-
* (at your option) any later version.
6+
* For community documentation and downloads visit wiki.developer.mindtouch.com;
7+
* please review the licensing section.
108
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
16-
* You should have received a copy of the GNU General Public License
17-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
9+
* Licensed under the Apache License, Version 2.0 (the "License");
10+
* you may not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS,
17+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
1820
*
1921
*/
2022

SGMLTests/Tests.cs

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
/*
22
*
3-
* Copyright (c) 2007-2011 MindTouch. All rights reserved.
3+
* Copyright (c) 2007-2013 MindTouch. All rights reserved.
44
* www.mindtouch.com [email protected]
55
*
6-
* This program is free software: you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation, either version 3 of the License, or
9-
* (at your option) any later version.
6+
* For community documentation and downloads visit wiki.developer.mindtouch.com;
7+
* please review the licensing section.
108
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
16-
* You should have received a copy of the GNU General Public License
17-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
9+
* Licensed under the Apache License, Version 2.0 (the "License");
10+
* you may not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS,
17+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
1820
*
1921
*/
2022

SgmlReader.sln

+12-7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1212
build.ps1 = build.ps1
1313
default.ps1 = default.ps1
1414
SGMLReader.nuspec = SGMLReader.nuspec
15+
license.txt = license.txt
16+
ReadMe.md = ReadMe.md
17+
Readme.htm = Readme.htm
1518
EndProjectSection
1619
EndProject
1720
Global
@@ -21,27 +24,29 @@ Global
2124
Release|Any CPU = Release|Any CPU
2225
EndGlobalSection
2326
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24-
{606C348A-9A72-4179-9C55-4DD9914C22CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25-
{606C348A-9A72-4179-9C55-4DD9914C22CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
26-
{606C348A-9A72-4179-9C55-4DD9914C22CC}.Default|Any CPU.ActiveCfg = Debug|Any CPU
27-
{606C348A-9A72-4179-9C55-4DD9914C22CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
28-
{606C348A-9A72-4179-9C55-4DD9914C22CC}.Release|Any CPU.Build.0 = Release|Any CPU
2927
{499527FF-AE52-450F-B3E3-4AD53E1712AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3028
{499527FF-AE52-450F-B3E3-4AD53E1712AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
3129
{499527FF-AE52-450F-B3E3-4AD53E1712AD}.Default|Any CPU.ActiveCfg = Debug|Any CPU
3230
{499527FF-AE52-450F-B3E3-4AD53E1712AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
3331
{499527FF-AE52-450F-B3E3-4AD53E1712AD}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{606C348A-9A72-4179-9C55-4DD9914C22CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{606C348A-9A72-4179-9C55-4DD9914C22CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{606C348A-9A72-4179-9C55-4DD9914C22CC}.Default|Any CPU.ActiveCfg = Debug|Any CPU
35+
{606C348A-9A72-4179-9C55-4DD9914C22CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
36+
{606C348A-9A72-4179-9C55-4DD9914C22CC}.Release|Any CPU.Build.0 = Release|Any CPU
3437
{9CC3FC29-375F-44F1-95BE-D52246CC7B3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3538
{9CC3FC29-375F-44F1-95BE-D52246CC7B3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
3639
{9CC3FC29-375F-44F1-95BE-D52246CC7B3E}.Default|Any CPU.ActiveCfg = Debug|Any CPU
3740
{9CC3FC29-375F-44F1-95BE-D52246CC7B3E}.Default|Any CPU.Build.0 = Debug|Any CPU
3841
{9CC3FC29-375F-44F1-95BE-D52246CC7B3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
3942
{9CC3FC29-375F-44F1-95BE-D52246CC7B3E}.Release|Any CPU.Build.0 = Release|Any CPU
4043
EndGlobalSection
41-
GlobalSection(SolutionProperties) = preSolution
42-
HideSolutionNode = FALSE
44+
GlobalSection(NestedProjects) = preSolution
4345
EndGlobalSection
4446
GlobalSection(MonoDevelopProperties) = preSolution
4547
StartupItem = CommandLine\SgmlReader.csproj
4648
EndGlobalSection
49+
GlobalSection(SolutionProperties) = preSolution
50+
HideSolutionNode = FALSE
51+
EndGlobalSection
4752
EndGlobal

0 commit comments

Comments
 (0)