Merge branch 'upgrade/blazor070'

jsakamoto · Feb 8, 2019 · 476e844 · 476e844
2 parents b302a8e + 2f76d86
commit 476e844
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/Toolbelt.Blazor.TimeZoneKit.Sample/Toolbelt.Blazor.TimeZoneKit.Sample.csproj b/Toolbelt.Blazor.TimeZoneKit.Sample/Toolbelt.Blazor.TimeZoneKit.Sample.csproj
@@ -9,11 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="0.6.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="0.6.0" PrivateAssets="all" />
-    <PackageReference Include="Toolbelt.Blazor.TimeZoneKit" Version="2.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="0.7.0-preview1-final" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="0.7.0-preview1-final" PrivateAssets="all" />
 
-    <DotNetCliToolReference Include="Microsoft.AspNetCore.Blazor.Cli" Version="0.6.0" />
+    <DotNetCliToolReference Include="Microsoft.AspNetCore.Blazor.Cli" Version="0.7.0-preview1-final" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Toolbelt.Blazor.TimeZoneKit\Toolbelt.Blazor.TimeZoneKit.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Toolbelt.Blazor.TimeZoneKit/TimeZoneKit.CreateSystemTimeZones.cs b/Toolbelt.Blazor.TimeZoneKit/TimeZoneKit.CreateSystemTimeZones.cs
@@ -311,7 +311,8 @@ public static TimeZoneInfo[] CreateSystemTimeZones()
                     R(635556672000000000, 635871168000000000, 36000000000, T(72000000000, 3, 5, DayOfWeek.Sunday), T(108000000000, 10, 5, DayOfWeek.Sunday), 0),
                     R(635872032000000000, 636187392000000000, 36000000000, T(72000000000, 3, 5, DayOfWeek.Sunday), T(108000000000, 10, 5, DayOfWeek.Sunday), 0),
                     R(636188256000000000, 636502752000000000, 36000000000, T(72000000000, 3, 5, DayOfWeek.Sunday), T(108000000000, 10, 5, DayOfWeek.Sunday), 0),
-                    R(636503616000000000, 3155378112000000000, 36000000000, T(72000000000, 3, 5, DayOfWeek.Sunday), T(108000000000, 10, 5, DayOfWeek.Sunday), 0),
+                    R(636503616000000000, 636818112000000000, 36000000000, T(72000000000, 3, 5, DayOfWeek.Sunday), T(108000000000, 10, 5, DayOfWeek.Sunday), 0),
+                    R(636818976000000000, 3155378112000000000, 36000000000, T(72000000000, 3, 5, DayOfWeek.Sunday), T(108000000000, 10, 4, DayOfWeek.Sunday), 0),
                 }),
                 TZ("GMT Standard Time", 0, "(UTC+00:00) Dublin, Edinburgh, Lisbon, London", "GMT Standard Time", "GMT Daylight Time", new AdjustmentRule[] {
                     R(0, 3155378112000000000, 36000000000, T(36000000000, 3, 5, DayOfWeek.Sunday), T(72000000000, 10, 5, DayOfWeek.Sunday), 0),
@@ -710,7 +711,8 @@ public static TimeZoneInfo[] CreateSystemTimeZones()
                     R(635556672000000000, 635871168000000000, 36000000000, T(72000000000, 11, 1, DayOfWeek.Sunday), T(108000000000, 1, 3, DayOfWeek.Sunday), 0),
                     R(635872032000000000, 636187392000000000, 36000000000, T(72000000000, 11, 1, DayOfWeek.Sunday), T(108000000000, 1, 3, DayOfWeek.Sunday), 0),
                     R(636188256000000000, 636502752000000000, 36000000000, T(72000000000, 11, 1, DayOfWeek.Sunday), T(108000000000, 1, 3, DayOfWeek.Sunday), 0),
-                    R(636503616000000000, 3155378112000000000, 36000000000, T(72000000000, 11, 1, DayOfWeek.Sunday), T(108000000000, 1, 2, DayOfWeek.Sunday), 0),
+                    R(636503616000000000, 636818112000000000, 36000000000, T(72000000000, 11, 1, DayOfWeek.Sunday), T(108000000000, 1, 2, DayOfWeek.Sunday), 0),
+                    R(636818976000000000, 3155378112000000000, 36000000000, T(72000000000, 11, 1, DayOfWeek.Sunday), T(108000000000, 1, 3, DayOfWeek.Sunday), 0),
                 }),
                 TZ("Kamchatka Standard Time", 432000000000, "(UTC+12:00) Petropavlovsk-Kamchatsky - Old", "Kamchatka Standard Time", "Kamchatka Daylight Time", new AdjustmentRule[] {
                     R(0, 3155378112000000000, 36000000000, T(72000000000, 3, 5, DayOfWeek.Sunday), T(108000000000, 10, 5, DayOfWeek.Sunday), 0),