Skip to content

Commit 5720402

Browse files
authored
😭 Downgraded to NETSTANDARD12 and remove trailing slash. (#9)
1 parent 81d52a3 commit 5720402

File tree

4 files changed

+23
-15
lines changed

4 files changed

+23
-15
lines changed

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
33
"version": "3.1.100",
4-
"rollForward": "latestMinor"
4+
"rollForward": "latestFeature"
55
}
66
}

src/SimpleSitemap/SimpleSitemap.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard1.2;netstandard2.0</TargetFrameworks>
55
<PackageId>SimpleSitemap</PackageId>
66
<Authors>Justin Adler</Authors>
77
<Company>World Domination Technologies Pty. Ltd.</Company>

src/SimpleSitemap/SitemapService.cs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ namespace SimpleSiteMap
1111
public class SitemapService
1212
{
1313
private const string SitemapsNamespace = "http://www.sitemaps.org/schemas/sitemap/0.9";
14+
#if NETSTANDARD1_2
15+
private static readonly string ByteOrderMarkUtf8 = Encoding.UTF8.GetString(Encoding.UTF8.GetPreamble(), 0, Encoding.UTF8.GetPreamble().Length);
16+
#else
1417
private static readonly string ByteOrderMarkUtf8 = Encoding.UTF8.GetString(Encoding.UTF8.GetPreamble());
15-
18+
#endif
1619
/// <summary>
1720
/// Creates a sitemap for the given collection.
1821
/// </summary>
@@ -89,7 +92,7 @@ XElement GenerateLocXElement(SitemapNode sitemapNode, int page, bool appendPageQ
8992

9093
if (appendPageQueryParam)
9194
{
92-
uriString = $"{uriString}/?page={page}";
95+
uriString = $"{uriString}?page={page}";
9396
}
9497

9598
return new XElement(xmlns + "loc", uriString);
@@ -152,7 +155,12 @@ private static string ConvertXElementToString(XElement xElement)
152155
xElement.Save(writer);
153156
}
154157

155-
xmlResult = Encoding.UTF8.GetString(memoryStream.ToArray());
158+
var array = memoryStream.ToArray();
159+
#if NETSTANDARD1_2
160+
xmlResult = Encoding.UTF8.GetString(array, 0, array.Length);
161+
#else
162+
xmlResult = Encoding.UTF8.GetString(array);
163+
#endif
156164
}
157165

158166
if (!string.IsNullOrWhiteSpace(xmlResult) &&
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
33
<sitemap>
4-
<loc>http://www.foo.com/sitemap/foos/?page=1</loc>
4+
<loc>http://www.foo.com/sitemap/foos?page=1</loc>
55
<lastmod>2014-11-21T18:58:00+00:00</lastmod>
66
</sitemap>
77
<sitemap>
8-
<loc>http://www.foo.com/sitemap/foos/?page=2</loc>
8+
<loc>http://www.foo.com/sitemap/foos?page=2</loc>
99
<lastmod>2014-11-21T18:57:50+00:00</lastmod>
1010
</sitemap>
1111
<sitemap>
12-
<loc>http://www.foo.com/sitemap/foos/?page=3</loc>
12+
<loc>http://www.foo.com/sitemap/foos?page=3</loc>
1313
<lastmod>2014-11-21T18:57:40+00:00</lastmod>
1414
</sitemap>
1515
<sitemap>
16-
<loc>http://www.foo.com/sitemap/foos/?page=4</loc>
16+
<loc>http://www.foo.com/sitemap/foos?page=4</loc>
1717
<lastmod>2014-11-21T18:57:30+00:00</lastmod>
1818
</sitemap>
1919
<sitemap>
20-
<loc>http://www.foo.com/sitemap/foos/?page=5</loc>
20+
<loc>http://www.foo.com/sitemap/foos?page=5</loc>
2121
<lastmod>2014-11-21T18:57:20+00:00</lastmod>
2222
</sitemap>
2323
<sitemap>
24-
<loc>http://www.foo.com/sitemap/foos/?page=6</loc>
24+
<loc>http://www.foo.com/sitemap/foos?page=6</loc>
2525
<lastmod>2014-11-21T18:57:10+00:00</lastmod>
2626
</sitemap>
2727
<sitemap>
28-
<loc>http://www.foo.com/sitemap/foos/?page=7</loc>
28+
<loc>http://www.foo.com/sitemap/foos?page=7</loc>
2929
<lastmod>2014-11-21T18:57:00+00:00</lastmod>
3030
</sitemap>
3131
<sitemap>
32-
<loc>http://www.foo.com/sitemap/foos/?page=8</loc>
32+
<loc>http://www.foo.com/sitemap/foos?page=8</loc>
3333
<lastmod>2014-11-21T18:56:50+00:00</lastmod>
3434
</sitemap>
3535
<sitemap>
36-
<loc>http://www.foo.com/sitemap/foos/?page=9</loc>
36+
<loc>http://www.foo.com/sitemap/foos?page=9</loc>
3737
<lastmod>2014-11-21T18:56:40+00:00</lastmod>
3838
</sitemap>
3939
<sitemap>
40-
<loc>http://www.foo.com/sitemap/foos/?page=10</loc>
40+
<loc>http://www.foo.com/sitemap/foos?page=10</loc>
4141
<lastmod>2014-11-21T18:56:30+00:00</lastmod>
4242
</sitemap>
4343
</sitemapindex>

0 commit comments

Comments
 (0)