Skip to content

Commit

Permalink
Updates to latest stable.
Browse files Browse the repository at this point in the history
  • Loading branch information
Agnès Zitte committed Nov 21, 2018
1 parent 731098e commit 5020d87
Show file tree
Hide file tree
Showing 23 changed files with 49 additions and 49 deletions.
2 changes: 1 addition & 1 deletion build/Uno.UI.WpfHost.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<!-- Android 7.1 -->
<group targetFramework="net462">
<dependency id="Uno.UI" version="1.42.0-beta.368" />
<dependency id="Uno.UI" version="1.41.1" />
<dependency id="cef.redist.x64" version="3.3396.1786" />
<dependency id="cef.redist.x86" version="3.3396.1786" />
<dependency id="CefSharp.Common" version="67.0.0" />
Expand Down
24 changes: 12 additions & 12 deletions build/Uno.UI.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,33 +20,33 @@
<dependency id="Xamarin.Android.Support.v4" version="25.3.1" />
<dependency id="Xamarin.Android.Support.v7.AppCompat" version="25.3.1" />
<dependency id="Xamarin.Android.Support.v7.RecyclerView" version="25.3.1" />
<dependency id="Uno.SourceGenerationTasks" version="1.28.0-beta.153" />
<dependency id="Uno.Core" version="1.25.0-beta.54" />
<dependency id="Uno.Core.Build" version="1.25.0-beta.54" />
<dependency id="Uno.SourceGenerationTasks" version="1.28.0" />
<dependency id="Uno.Core" version="1.25.0" />
<dependency id="Uno.Core.Build" version="1.25.0" />
</group>

<!-- Android 8.0 -->
<group targetFramework="MonoAndroid80">
<dependency id="Xamarin.Android.Support.v4" version="26.1.0.1" />
<dependency id="Xamarin.Android.Support.v7.AppCompat" version="26.1.0.1" />
<dependency id="Xamarin.Android.Support.v7.RecyclerView" version="26.1.0.1" />
<dependency id="Uno.SourceGenerationTasks" version="1.28.0-beta.153" />
<dependency id="Uno.Core" version="1.25.0-beta.54" />
<dependency id="Uno.Core.Build" version="1.25.0-beta.54" />
<dependency id="Uno.SourceGenerationTasks" version="1.28.0" />
<dependency id="Uno.Core" version="1.25.0" />
<dependency id="Uno.Core.Build" version="1.25.0" />
</group>

<!-- iOS -->
<group targetFramework="xamarinios10">
<dependency id="Uno.SourceGenerationTasks" version="1.28.0-beta.153" />
<dependency id="Uno.Core" version="1.25.0-beta.54" />
<dependency id="Uno.Core.Build" version="1.25.0-beta.54" />
<dependency id="Uno.SourceGenerationTasks" version="1.28.0" />
<dependency id="Uno.Core" version="1.25.0" />
<dependency id="Uno.Core.Build" version="1.25.0" />
</group>

<!-- .NET Standard 2.0 -->
<group targetFramework="netstandard2.0">
<dependency id="Uno.SourceGenerationTasks" version="1.28.0-beta.153" />
<dependency id="Uno.Core" version="1.25.0-beta.54" />
<dependency id="Uno.Core.Build" version="1.25.0-beta.54" />
<dependency id="Uno.SourceGenerationTasks" version="1.28.0" />
<dependency id="Uno.Core" version="1.25.0" />
<dependency id="Uno.Core.Build" version="1.25.0" />
<dependency id="System.Numerics.Vectors" version="4.5.0-preview1-26216-02" />
<dependency id="System.Runtime.InteropServices.WindowsRuntime" version="4.3.0" />
</group>
Expand Down
2 changes: 1 addition & 1 deletion src/SamplesApp/SamplesApp.Droid/SamplesApp.Droid.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.SourceGenerationTasks">
<Version>1.28.0-beta.153</Version>
<Version>1.28.0</Version>
<NoWarn>NU1701</NoWarn>
</PackageReference>
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0-dev.58" />
Expand Down
2 changes: 1 addition & 1 deletion src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<ItemGroup>
<PackageReference Include="Uno.SourceGenerationTasks">
<Version>1.28.0-beta.153</Version>
<Version>1.28.0</Version>
<NoWarn>NU1701</NoWarn>
</PackageReference>
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0-dev.58" />
Expand Down
2 changes: 1 addition & 1 deletion src/SamplesApp/SamplesApp.iOS/SamplesApp.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.SourceGenerationTasks">
<Version>1.28.0-beta.153</Version>
<Version>1.28.0</Version>
<NoWarn>NU1701</NoWarn>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
Expand Down
2 changes: 1 addition & 1 deletion src/SamplesApp/SamplesApp.macOS/SamplesApp.macOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

<ItemGroup>
<PackageReference Include="Uno.SourceGenerationTasks">
<Version>1.28.0-beta.153</Version>
<Version>1.28.0</Version>
<NoWarn>NU1701</NoWarn>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='xamarinios10' or '$(TargetFramework)'=='monoandroid80' or '$(TargetFramework)'=='netstandard2.0'">
<PackageReference Include="Uno.UI" Version="1.42.0-beta.368" />
<PackageReference Include="Uno.UI" Version="1.41.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.UI" Version="1.42.0-beta.368" />
<PackageReference Include="Uno.UI" Version="1.41.1" />
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.32" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Uno.UI" Version="1.42.0-beta.368" />
<PackageReference Include="Uno.UI" Version="1.41.1" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0-dev.58" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<BundleResource Include="Resources\Fonts\winjs-symbols.ttf" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.UI" Version="1.42.0-beta.368" />
<PackageReference Include="Uno.UI" Version="1.41.1" />
</ItemGroup>
<Import Project="..\$ext_safeprojectname$.Shared\$ext_safeprojectname$.Shared.projitems" Label="Shared" Condition="Exists('..\$ext_safeprojectname$.Shared\$ext_safeprojectname$.Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
<Version>2.3.1</Version>
</PackageReference>
<PackageReference Include="Uno.Core">
<Version>1.25.0-beta.54</Version>
<Version>1.25.0</Version>
</PackageReference>
<PackageReference Include="Uno.SourceGeneration">
<Version>1.28.0-beta.153</Version>
<Version>1.28.0</Version>
</PackageReference>
<PackageReference Include="Uno.SourceGenerationTasks">
<Version>1.28.0-beta.153</Version>
<Version>1.28.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/SourceGenerators/Uno.UI.Tasks/Uno.UI.Tasks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.Core">
<Version>1.25.0-beta.54</Version>
<Version>1.25.0</Version>
</PackageReference>
<PackageReference Include="Uno.SourceGenerationTasks">
<Version>1.28.0-beta.153</Version>
<Version>1.28.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

<ItemGroup>
<PackageReference Include="Uno.SourceGenerationTasks">
<Version>1.28.0-beta.153</Version>
<Version>1.28.0</Version>
<ExcludeAssets>Runtime</ExcludeAssets>
</PackageReference>
<PackageReference Include="Uno.Core.Build">
<Version>1.25.0-beta.54</Version>
<Version>1.25.0</Version>
</PackageReference>
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

<ItemGroup>
<PackageReference Include="Uno.SourceGenerationTasks">
<Version>1.28.0-beta.153</Version>
<Version>1.28.0</Version>
<ExcludeAssets>Runtime</ExcludeAssets>
</PackageReference>
<PackageReference Include="Uno.Core.Build">
<Version>1.25.0-beta.54</Version>
<Version>1.25.0</Version>
</PackageReference>
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Uno.Foundation/Uno.Foundation.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
<PackageReference Include="Uno.SourceGenerationTasks">
<Version>1.28.0-beta.153</Version>
<Version>1.28.0</Version>
<ExcludeAssets>Runtime</ExcludeAssets>
</PackageReference>
<PackageReference Include="Uno.Core">
<Version>1.25.0-beta.54</Version>
<Version>1.25.0</Version>
<ExcludeAssets>Runtime</ExcludeAssets>
</PackageReference>
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/Uno.UI.Maps/Uno.UI.Maps.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@

<ItemGroup>
<PackageReference Include="Uno.SourceGenerationTasks">
<Version>1.28.0-beta.153</Version>
<Version>1.28.0</Version>
</PackageReference>
<PackageReference Include="Uno.Core">
<Version>1.25.0-beta.54</Version>
<Version>1.25.0</Version>
</PackageReference>
<PackageReference Include="Uno.Core.Build">
<Version>1.25.0-beta.54</Version>
<Version>1.25.0</Version>
</PackageReference>
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Uno.UI.Tests.Performance/Uno.UI.Tests.Performance.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
<Version>1.3.1</Version>
</PackageReference>
<PackageReference Include="Uno.SourceGenerationTasks">
<Version>1.28.0-beta.153</Version>
<Version>1.28.0</Version>
</PackageReference>
<PackageReference Include="Uno.Core">
<Version>1.25.0-beta.54</Version>
<Version>1.25.0</Version>
</PackageReference>
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Uno.UI.Tests/Uno.UI.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
<Version>1.3.1</Version>
</PackageReference>
<PackageReference Include="Uno.SourceGenerationTasks">
<Version>1.28.0-beta.153</Version>
<Version>1.28.0</Version>
</PackageReference>
<PackageReference Include="Uno.Core">
<Version>1.25.0-beta.54</Version>
<Version>1.25.0</Version>
</PackageReference>
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions src/Uno.UI.Toolkit/Uno.UI.Toolkit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@

<ItemGroup>
<PackageReference Include="Uno.SourceGenerationTasks">
<Version>1.28.0-beta.153</Version>
<Version>1.28.0</Version>
</PackageReference>
<PackageReference Include="Uno.Core">
<Version>1.25.0-beta.54</Version>
<Version>1.25.0</Version>
</PackageReference>
<PackageReference Include="Uno.Core.Build">
<Version>1.25.0-beta.54</Version>
<Version>1.25.0</Version>
</PackageReference>
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Uno.UI.Wasm/Uno.UI.Wasm.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<ItemGroup>
<PackageReference Include="Uno.Core">
<Version>1.25.0-beta.54</Version>
<Version>1.25.0</Version>
<ExcludeAssets>Runtime</ExcludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.TypeScript.Compiler" Version="2.8.3" />
Expand Down
6 changes: 3 additions & 3 deletions src/Uno.UI/Uno.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,13 @@
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
<PackageReference Include="Uno.SourceGenerationTasks">
<Version>1.28.0-beta.153</Version>
<Version>1.28.0</Version>
</PackageReference>
<PackageReference Include="Uno.Core">
<Version>1.25.0-beta.54</Version>
<Version>1.25.0</Version>
</PackageReference>
<PackageReference Include="Uno.Core.Build">
<Version>1.25.0-beta.54</Version>
<Version>1.25.0</Version>
</PackageReference>
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Uno.UWP/Uno.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0-preview1-26216-02" />
<PackageReference Include="Uno.SourceGenerationTasks">
<Version>1.28.0-beta.153</Version>
<Version>1.28.0</Version>
</PackageReference>
<PackageReference Include="Uno.Core">
<Version>1.25.0-beta.54</Version>
<Version>1.25.0</Version>
<ExcludeAssets>Runtime</ExcludeAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Uno.UWPSyncGenerator/Uno.UWPSyncGenerator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<PackageReference Include="Microsoft.Tpl.Dataflow">
<Version>4.5.24</Version>
</PackageReference>
<PackageReference Include="Uno.Core" Version="1.25.0-beta.54" />
<PackageReference Include="Uno.Core" Version="1.25.0" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 5020d87

Please sign in to comment.