Skip to content

Commit

Permalink
Merge pull request #64 from unoplatform/dev/mhawker/uno-base-update
Browse files Browse the repository at this point in the history
Update Uno Version to 2.0.236-dev.2800
  • Loading branch information
jeromelaban authored Oct 15, 2019
2 parents d32d053 + 0b6097f commit 269345c
Show file tree
Hide file tree
Showing 13 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid80' or '$(TargetFramework)' == 'xamarinios10' or '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
<PackageReference Include="Uno.UI" Version="2.0.236-dev.2800" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

</ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2711" />
<PackageReference Include="Uno.UI" Version="2.0.236-dev.2800" />
</ItemGroup>

<Import Project="..\uno.ui.include.props" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
<PackageReference Include="Uno.UI" Version="2.0.236-dev.2800" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed">
<Version>2.0.1-uno.28</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2711" />
<PackageReference Include="Uno.UI" Version="2.0.236-dev.2800" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
<PackageReference Include="Uno.UI" Version="2.0.236-dev.2800" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0-dev.302" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed">
<Version>2.0.1-uno.28</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
<PackageReference Include="Uno.UI" Version="2.0.236-dev.2800" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

</ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
<PackageReference Include="Uno.UI" Version="2.0.236-dev.2800" />
</ItemGroup>

<Import Project="..\uno.ui.include.props" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
<PackageReference Include="Uno.UI" Version="2.0.236-dev.2800" />
</ItemGroup>

<Import Project="..\uno.ui.include.props" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'monoandroid80' or '$(TargetFramework)' == 'xamarinios10' or '$(TargetFrameworkIdentifier)' == '.NETStandard'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
<PackageReference Include="Uno.UI" Version="2.0.236-dev.2800" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
<PackageReference Include="Uno.UI" Version="2.0.236-dev.2800" />
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.13.7" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
<PackageReference Include="Uno.UI" Version="2.0.236-dev.2800" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
<PackageReference Include="Uno.UI" Version="2.0.236-dev.2800" />
</ItemGroup>

<Import Project="..\uno.ui.include.props" />
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
<PackageReference Include="Uno.UI" Version="2.0.236-dev.2800" />
</ItemGroup>

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

0 comments on commit 269345c

Please sign in to comment.