Skip to content

Commit d380678

Browse files
jeromelabanjeromelaban
authored
Merge pull request #73 from unoplatform/dev/jela/dg-remove
Update to uno latest, remove splitter sample
2 parents 3fdaf8e + 7d68941 commit d380678

File tree

15 files changed

+35
-35
lines changed

15 files changed

+35
-35
lines changed

‎Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
<PackageReference Include="Microsoft.Identity.Client" Version="2.7.0" />
2929
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
3030
<PackageReference Include="System.Net.Http" Version="4.3.3" />
31-
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4019" />
31+
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4178" />
3232
</ItemGroup>
3333

3434
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid80' or '$(TargetFramework)' == 'xamarinios10' or '$(TargetFramework)' == 'netstandard2.0'">
35-
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4019" />
35+
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4178" />
3636
<Reference Include="System.Runtime.Serialization" />
3737
<Reference Include="System.Xml" />
3838
<Reference Include="System.Xml.Linq" />

‎Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
</ItemGroup>
1818
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS'">
19-
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4019" />
19+
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4178" />
2020
</ItemGroup>
2121

2222
<Import Project="..\uno.ui.include.props" />

‎Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
</ItemGroup>
1717

1818
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard'">
19-
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4019" />
19+
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4178" />
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4019" />
23+
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4178" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

‎Microsoft.Toolkit.Uwp.SampleApp.Droid/Microsoft.Toolkit.Uwp.SampleApp.Droid.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed">
9191
<Version>2.0.1-uno.28</Version>
9292
</PackageReference>
93-
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4019" />
93+
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4178" />
9494
</ItemGroup>
9595
<ItemGroup>
9696
<ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj">

‎Microsoft.Toolkit.Uwp.SampleApp.Shared/SamplePages/samples.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -168,16 +168,16 @@
168168
// "Icon": "/SamplePages/ScrollHeader/ScrollHeader.png",
169169
// "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ScrollHeader.md"
170170
//},
171-
{
172-
"Name": "GridSplitter",
173-
"Type": "GridSplitterPage",
174-
"Subcategory": "Layout",
175-
"About": "GridSplitter represents the control that redistributes space between columns or rows of a Grid control.",
176-
"CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter",
177-
"XamlCodeFile": "GridSplitter.bind",
178-
"Icon": "/SamplePages/GridSplitter/GridSplitter.png",
179-
"DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/GridSplitter.md"
180-
},
171+
//{
172+
// "Name": "GridSplitter",
173+
// "Type": "GridSplitterPage",
174+
// "Subcategory": "Layout",
175+
// "About": "GridSplitter represents the control that redistributes space between columns or rows of a Grid control.",
176+
// "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter",
177+
// "XamlCodeFile": "GridSplitter.bind",
178+
// "Icon": "/SamplePages/GridSplitter/GridSplitter.png",
179+
// "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/GridSplitter.md"
180+
//},
181181
//{
182182
// "Name": "DropShadowPanel",
183183
// "Type": "DropShadowPanelPage",

‎Microsoft.Toolkit.Uwp.SampleApp.Wasm/Microsoft.Toolkit.Uwp.SampleApp.Wasm.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4019" />
36-
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0" />
35+
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4178" />
36+
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.8" />
3737
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
3838
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
3939
<PackageReference Include="Microsoft.TypeScript.Compiler" Version="2.8.3" />
4040
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="2.8.3" />
4141
<PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.23" />
4242
<Reference Include="System.Net.Http" />
43-
<DotNetCliToolReference Include="Uno.Wasm.Bootstrap.Cli" Version="1.0.0" />
43+
<DotNetCliToolReference Include="Uno.Wasm.Bootstrap.Cli" Version="1.0.8" />
4444
</ItemGroup>
4545

4646
<ItemGroup>

‎Microsoft.Toolkit.Uwp.SampleApp.iOS/Microsoft.Toolkit.Uwp.SampleApp.iOS.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed">
119119
<Version>2.0.1-uno.28</Version>
120120
</PackageReference>
121-
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4019" />
121+
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4178" />
122122
</ItemGroup>
123123
<ItemGroup>
124124
<ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj">

‎Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
120120
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
121121
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
122-
<PackageReference Include="Uno.Core" Version="1.29.0-dev.103" />
122+
<PackageReference Include="Uno.Core" Version="1.29.0" />
123123
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
124124
<Version>6.2.9</Version>
125125
</PackageReference>

‎Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
<ItemGroup>
1818
<!-- This is here to prevent a conflict in certain circumstances -->
1919
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
20-
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4019" />
20+
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4178" />
2121

2222
<ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj" />
2323
<ProjectReference Include="..\Microsoft.Toolkit.Services\Microsoft.Toolkit.Services.csproj" />
2424
<ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
2525

2626
</ItemGroup>
2727
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS'">
28-
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4019" />
28+
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4178" />
2929
</ItemGroup>
3030

3131
<Import Project="..\uno.ui.include.props" />

‎Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ItemGroup>
1414
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
1515
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.1-uno.28" />
16-
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4019" />
16+
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4178" />
1717
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
1818
</ItemGroup>
1919

@@ -22,7 +22,7 @@
2222
</ItemGroup>
2323

2424
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard'">
25-
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4019" />
25+
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4178" />
2626
</ItemGroup>
2727

2828
<Import Project="..\uno.ui.include.props" />

0 commit comments

Comments
 (0)