Skip to content

Commit

Permalink
Merge pull request #2355 from Microsoft/dev
Browse files Browse the repository at this point in the history 
Sync from dev
  • Loading branch information
@mvegaca
mvegaca authored Jun 8, 2018
2 parents 18179aa + ddf4139 commit 6f9c2b2
Show file tree
Hide file tree
Showing 35 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion templates/Uwp/Features/FirstUsePrompt.Prism/_postaction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Features/FirstUsePrompt/_postaction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Features/FirstUsePromptVB/_postaction.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Features/LiveTile.Prism/_postaction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Features/LiveTile/_postaction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Features/LiveTileVB/_postaction.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Features/SettingsStorage/_postaction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Newtonsoft.Json">
<Version>11.0.1</Version>
<Version>11.0.2</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Features/SettingsStorageVB/_postaction.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Newtonsoft.Json">
<Version>11.0.1</Version>
<Version>11.0.2</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Features/ToastNotifications.Prism/_postaction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Features/ToastNotifications/_postaction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Features/ToastNotificationsVB/_postaction.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Features/WhatsNewPrompt.Prism/_postaction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Features/WhatsNewPrompt/_postaction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Features/WhatsNewPromptVB/_postaction.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Pages/Chart.CodeBehind/_postaction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Telerik.UI.for.UniversalWindowsPlatform">
<Version>1.0.0.9</Version>
<Version>1.0.1</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Pages/Chart.CodeBehindVB/_postaction.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Telerik.UI.for.UniversalWindowsPlatform">
<Version>1.0.0.9</Version>
<Version>1.0.1</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Pages/Chart.Prism/_postaction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Telerik.UI.for.UniversalWindowsPlatform">
<Version>1.0.0.9</Version>
<Version>1.0.1</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Pages/Chart/_postaction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Telerik.UI.for.UniversalWindowsPlatform">
<Version>1.0.0.9</Version>
<Version>1.0.1</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Pages/ChartVB/_postaction.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Telerik.UI.for.UniversalWindowsPlatform">
<Version>1.0.0.9</Version>
<Version>1.0.1</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Pages/Grid.CodeBehind/_postaction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Telerik.UI.for.UniversalWindowsPlatform">
<Version>1.0.0.9</Version>
<Version>1.0.1</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Pages/Grid.CodeBehindVB/_postaction.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Telerik.UI.for.UniversalWindowsPlatform">
<Version>1.0.0.9</Version>
<Version>1.0.1</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Pages/Grid.Prism/_postaction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Telerik.UI.for.UniversalWindowsPlatform">
<Version>1.0.0.9</Version>
<Version>1.0.1</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Pages/Grid/_postaction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Telerik.UI.for.UniversalWindowsPlatform">
<Version>1.0.0.9</Version>
<Version>1.0.1</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Pages/GridVB/_postaction.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Telerik.UI.for.UniversalWindowsPlatform">
<Version>1.0.0.9</Version>
<Version>1.0.1</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Pages/MasterDetail.CaliburnMicro/_postaction.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/Projects/Default/wts.DefaultProject.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.0.8</Version>
<Version>6.1.5</Version>
</PackageReference>
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
<Version>2.0.0</Version>
Expand Down
2 changes: 1 addition & 1 deletion templates/Uwp/Projects/DefaultPrism/wts.DefaultProject.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.0.8</Version>
<Version>6.1.5</Version>
</PackageReference>
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
<Version>2.0.0</Version>
Expand Down
2 changes: 1 addition & 1 deletion templates/Uwp/Projects/DefaultVB/wts.DefaultProject.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.0.8</Version>
<Version>6.1.5</Version>
</PackageReference>
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
<Version>2.0.0</Version>
Expand Down
2 changes: 1 addition & 1 deletion .../_composition/CaliburnMicro/Page.MediaPlayer.AddNavigation_TabbedPivot/_postaction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp.UI">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion ...Uwp/_composition/CodeBehind/Page.MediaPlayer.AddNavigation_TabbedPivot/_postaction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp.UI">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion ...p/_composition/CodeBehind/Page.MediaPlayer.AddNavigation_TabbedPivotVB/_postaction.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp.UI">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/_composition/_shared/Page.MasterDetail/_postaction.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion templates/Uwp/_composition/_shared/Page.MasterDetailVB/_postaction.vbproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion ...es/Uwp/_composition/_shared/Page.MediaPlayer.AddNavigation_TabbedPivot/_postaction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp.UI">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->
2 changes: 1 addition & 1 deletion .../Uwp/_composition/_shared/Page.MediaPlayer.AddNavigation_TabbedPivotVB/_postaction.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Nuget package references -->
<!--{[{-->
<PackageReference Include="Microsoft.Toolkit.Uwp.UI">
<Version>2.2.0</Version>
<Version>3.0.0</Version>
</PackageReference>
<!--}]}-->

0 comments on commit 6f9c2b2

Please sign in to comment.