Skip to content

Commit

Permalink
Merge pull request #379 from nventive/release/stable/Y
Browse files Browse the repository at this point in the history
Release/stable/y
  • Loading branch information
agneszitte authored Nov 21, 2018
2 parents 7560f78 + 5020d87 commit c6830b7
Show file tree
Hide file tree
Showing 5,748 changed files with 59,479 additions and 67,248 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
11 changes: 9 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Issue: #
<!-- Link to relevant issue. All PRs should be asociated with an issue -->
GitHub Issue (If applicable): #
<!-- Link to relevant GitHub issue if applicable. All PRs should be associated with an issue (GitHub issue or internal) -->

## PR Type
What kind of change does this PR introduce?
Expand All @@ -19,6 +19,7 @@ What kind of change does this PR introduce?


## What is the new behavior?
<!-- Please describe the new behavior after your modifications. -->


## PR Checklist
Expand All @@ -29,9 +30,15 @@ Please check if your PR fulfills the following requirements:
- [ ] Docs have been added/updated which fit [documentation template](https://github.com/nventive/Uno/blob/master/doc/.feature-template.md). (for bug fixes / features)
- [ ] Tests for the changes have been added (for bug fixes / features) (if applicable)
- [ ] Contains **NO** breaking changes
- [ ] Updated the [Release Notes](https://github.com/nventive/Uno/tree/master/doc/ReleaseNotes)
- [ ] Associated with an issue (GitHub or internal)

<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below.
Please note that breaking changes are likely to be rejected -->


## Other information
<!-- Please provide any additional information if necessary -->

Internal Issue (If applicable):
<!-- Link to relevant internal issue if applicable. All PRs should be associated with an issue (GitHub issue or internal) -->
53 changes: 50 additions & 3 deletions .vsts-ci.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
phases:
- phase: VS_Latest
variables:
NUGET_PACKAGES: $(Agent.WorkFolder)\.nuget
NUGET_HTTP_CACHE_PATH: $(Agent.WorkFolder)\.nuget-http-cache
CombinedConfiguration: Release|Any CPU
CI_Build: true


steps:
- checkout: self
clean: true
Expand Down Expand Up @@ -70,6 +67,56 @@ phases:
ArtifactName: NugetPackages
ArtifactType: Container

# Disabled until VS4Mac is updated to 7.7 or later.
#- phase: macOS
# variables:
# NUGET_PACKAGES: $(Agent.WorkFolder)\.nuget
# NUGET_HTTP_CACHE_PATH: $(Agent.WorkFolder)\.nuget-http-cache
# CombinedConfiguration: Release|Any CPU
# CI_Build: true
# SourceLinkEnabled: false
#
# queue:
# name: Hosted macOS
#
# steps:
# - checkout: self
# clean: true
#
# - task: NuGetToolInstaller@0
# inputs:
# versionSpec: 4.7.0
# checkLatest: false
#
# - task: NuGetCommand@2
# inputs:
# command: restore
# solution: src/Uno.UI-vs4mac.sln
# selectOrConfig: select
# includeNuGetOrg: true
# verbosityRestore: Normal
#
# - task: MSBuild@1
# inputs:
# solution: Build/Uno.UI.proj
# msbuildLocationMethod: version
# msbuildVersion: latest
# msbuildArchitecture: x86
# msbuildArguments: /r /p:CheckExclusions=True "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)/build-macos.binlog
# clean: false
# maximumCpuCount: true
# restoreNugetPackages: false
# logProjectEvents: false
# createLogFile: false
#
# - task: PublishBuildArtifacts@1
# # https://developercommunity.visualstudio.com/content/problem/284991/public-vsts-previouw-cant-set-build-number-of-pr-b.html
# condition: eq(variables['System.PullRequest.IsFork'], 'False')
# inputs:
# PathtoPublish: $(build.artifactstagingdirectory)
# ArtifactName: uno-macos-artifacts
# ArtifactType: Container

- phase: Documentation
variables:
NUGET_PACKAGES: $(Agent.WorkFolder)\.nuget
Expand Down
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.40.0" />
<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.27.0" />
<dependency id="Uno.Core" version="1.24.0" />
<dependency id="Uno.Core.Build" version="1.24.0" />
<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.27.0" />
<dependency id="Uno.Core" version="1.24.0" />
<dependency id="Uno.Core.Build" version="1.24.0" />
<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.27.0" />
<dependency id="Uno.Core" version="1.24.0" />
<dependency id="Uno.Core.Build" version="1.24.0" />
<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.27.0" />
<dependency id="Uno.Core" version="1.24.0" />
<dependency id="Uno.Core.Build" version="1.24.0" />
<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
23 changes: 18 additions & 5 deletions build/Uno.UI.proj
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<AppEnvironment Condition="'$(CombinedConfiguration)' != '' and $(CombinedConfiguration.Split('|').Length) > 2">$(CombinedConfiguration.Split('|')[2])</AppEnvironment>

<UpdateAssemblyInfo>false</UpdateAssemblyInfo>
<_isWindows>$([MSBuild]::IsOsPlatform(Windows))</_isWindows>
</PropertyGroup>

<Import Project=".\obj\Uno.UI.Build.csproj.nuget.g.props"/>
Expand All @@ -25,13 +26,15 @@
Use NuGet 4.3.0 or later for the restore
CI_Build environment is required for the restore to pickup the TargetFrameworksCI property in projects.
-->
<Exec Command="set NUGET_RESTORE_MSBUILD_ARGS=/p:CI_Build=true &amp; nuget\nuget.exe restore ..\src\Uno.UI.sln" Condition="'$(AppEnvironment)'=='' " />
<Exec Command="set NUGET_RESTORE_MSBUILD_ARGS=/p:CI_Build=true &amp; nuget\nuget.exe restore ..\src\Uno.UI.sln"
Condition="'$(AppEnvironment)'=='' and $(_isWindows) " />

<CallTarget Targets="BuildCI" Condition="'$(Configuration)'=='Release'" />
<CallTarget Targets="BuildCI" Condition="'$(Configuration)'=='Release' and $(_isWindows)" />
<CallTarget Targets="BuildCImacOS" Condition="'$(Configuration)'=='Release' and !$(_isWindows)" />

<CallTarget Targets="BuildNuGetPackage" Condition="'$(Configuration)'=='Release'" />
<CallTarget Targets="PublishVisx" Condition="'$(Configuration)'=='Release'" />
<CallTarget Targets="GenerateAPIDiff" Condition="'$(Configuration)'=='Release'" />
<CallTarget Targets="PublishVisx" Condition="'$(Configuration)'=='Release' and $(_isWindows)" />
<CallTarget Targets="GenerateAPIDiff" Condition="'$(Configuration)'=='Release' and $(_isWindows)" />
</Target>

<Target Name="UpdateFileVersions">
Expand Down Expand Up @@ -94,7 +97,17 @@

</Target>

<Target Name="GenerateDoc">
<Target Name="BuildCImacOS">

<MSBuild Properties="Configuration=Release;VisualStudioVersion=15.0;CopyDSYM=False;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true"
Projects="..\src\Uno.UI-vs4mac.sln"
Targets="Build"
RebaseOutputs="false"
BuildInParallel="true" />

</Target>

<Target Name="GenerateDoc">
<MSBuild Properties="Configuration=Release;VisualStudioVersion=15.0"
Projects="..\src\Uno.UWPSyncGenerator\Uno.UWPSyncGenerator.csproj"
Targets="Build" />
Expand Down
2 changes: 2 additions & 0 deletions doc/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@
/**/bin/
/**/obj/
_site
_exported_templates
package-lock.json
Binary file removed doc/Assets/layouting-ios.pptx
Binary file not shown.
54 changes: 50 additions & 4 deletions doc/ReleaseNotes/_ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,59 @@
## Next version

### Features
*

### Breaking changes
*

### Bug fixes
*



## Release 1.42

### Features
* Add base infrastructure platform for macOS
* 136259 Add a behavior so that tap makes controls fade out
* 135985 [Android], [iOS] ListViewBase Support [MultiSelectStates](https://msdn.microsoft.com/en-us/library/windows/apps/mt299136.aspx?f=255&MSPPError=-2147217396) on ListViewItem. This allows the item container to visually adapt when multiple selection is enabled or disabled.
* #325 Add support for `NavigationView` control
* Add support for `SymbolIcon` control for WebAssembly
* Add support for `UIElement.Clip` for WebAssembly
* Add support for inner-Uno.UI strings localization
* Add stubs for RichTextBlock
* Add `BitmapIcon` support
* Add `BitmapIcon.ShowAsMonochrome` support
* Add support for `Windows.Foundation.UniversalApiContract` in `IsApiContractPresent`
* Add support for ContentProperty on UserControl
* Add DelegateCommand<T>

### Breaking changes
* 132002 [Android] The collapsible button bar is now taken into account by visible bounds calculation. Apps which use VisibleBoundsPadding or have command bars will therefore see an adjustment to the height of their windows on Android.

### Bug fixes
* 135258 [Android] Fixed ImageBrush flash/flickering occurs when transitioning to a new page for the first time.
* 131768 [iOS] Fixed bug where stale ScrollIntoView() request could overwrite more recent request
* 136092 [iOS] ScrollIntoView() throws exception for ungrouped lists
* 136199 [Android] TextBlock.Text isn't visually updated if it changes while device is locked
* Fix Android and iOS may fail to break on breakpoints in `.xaml.cs` if the debugging symbol type is Full in projects created from templates
* 136210 [Android] Path is cut off by a pixel
* 132004 [Android] Window bounds incorrect for screen with rounded corners
* #312 [Wasm] Text display was chopped on Wasm.
* 135839 `WebView` No longer raises NavigationFailed and NavigationCompleted events when navigation is cancelled on iOS.
* 136188 [Android] Page elements are aligned differently upon back navigation
* 136114 [iOS] Image inside Frame doesn't respond to orientation changes
* Fix crash when a `VisualState` does not have a valid `Name`
* Adjust compiled binding application ordering when loading controls
* Ensure the SplitView templated parent is propagated properly for FindName
* Fix infinite loop when parsing empty Attached Properties on macOS
* 137137 [iOS] Fixed `DatePickerSelector` not propagating coerced initial value
* 103116 [iOS] Navigating to a _second_ local html file with `WebView` doesn't work.
* 134573 CommandBar doesn't take the proper space on iOS phones in landscape
* Image with partial size constraint now display properly under Wasm.
* 138297 [iOS][TextBlock] Measurement is always different since we use Math.Ceiling
* 137204 [iOS] ListView - fix bug where item view is clipped
* 137979 [Android] Incorrect offset when applying RotateTransform to stretched view
* Now supports internal object in desource dictionaries
* 134573 CommandBar doesn't take the proper space on iOS phones in landscape
* #26 The explicit property <Style.Setters> does not intialize style setters properly

## Release 1.41

Expand All @@ -36,4 +82,4 @@
* 135646 [Android] Binding MediaPlayerElement.Source causes video to go blank
* 136093, 136172 [iOS] ComboBox does not display its Popup
* 134819, 134828 [iOS] Ensures the back gesture is enabled and disabled properly when the CommandBar is visible, collapsed, visible with a navigation command and collapsed with a navigation command.
* 136092 [iOS] ScrollIntoView() throws exception for ungrouped lists
* 137081 Xaml generator doesn't support setting a style on the root control
File renamed without changes
8 changes: 4 additions & 4 deletions doc/articles/MediaPlayerElement.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ _If you need to set source programmatically (ie, using `_mediaPlayerElement.Sour
| | Skip backward | X | X | |
| | Show buffering progress | X | X | |
| | Zoom mode | X | X | |
| | Fullscreen mode | - | - | |
| | Fullscreen mode | X | X | |
| | Change playback rate | - | - | |
| | Player controls on locked screen support | - | - | |
| | Playlists support | - | - | |
Expand Down Expand Up @@ -86,6 +86,6 @@ Add the folowwing to your AndroidManifest.xml

## Known issues

- Volume flyout does not display on iOS (Uno issue)
- Dynamic width/height not supported when playing audio
- Sometimes flickers during resizing when using dynamic width/height
- `[iOS]` Volume flyout does not display (Uno issue)
- `[All]` Dynamic width/height not supported when playing audio
- `[All]` Sometimes flickers during resizing when using dynamic width/height
File renamed without changes.
41 changes: 40 additions & 1 deletion doc/articles/debugging-uno-ui.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ step into Uno.UI without downloading the repository.
Make sure **Enable source link support** check box is checked in **Tools** / **Options**
/ **Debugging** / **General** properties page.

# Debugging Uno.UI
## Debugging Uno.UI

To debug Uno.UI inside of an existing project, the simplest way (until Microsoft provides a better way to avoid overriding the global cache) is to :
* Install a published `Uno.UI` package in a project you want to debug, taking note of the version number.
Expand All @@ -30,3 +30,42 @@ To ensure that the file you have in your cache a correct, either clear the cache
product version should contain a git CommitID.

Once Uno.UI built, open the files you want to debug inside the solution running the application you need to debug, and set breakpoints there.

## Building Uno.UI for macOS using Visual Studio for Mac

Building Uno.UI for the macOS platform using vs4mac requires Visual Studio for mac 7.7 preview or later.

A few steps to be able to build:
- The `xamarinmac20` Target Framework must be the first in the `TargetFrameworks` list of the `Uno.UI`, `Uno`, `Uno.Foundation` and `Uno.Xaml` projects. VS4Mac only builds the first Target Framework.
- In both `Uno` and `Uno.UI` the ItemGroups containing references to `Xamarin.Android.Support.v4` and `Xamarin.Android.Support.v7.AppCompat` must be commented out.
Failing to remove those groups will make the nuget restore fail, because VS4Mac does not support conditional package references.
- In `Uno.UI`, comment the project reference to the `Uno.UI.BindingHelper` project, because VS4Mac does not support conditional project references.
- Disable both nuget restore features in Visual Studio for Mac configuration

To build and run:
- In a shell in the `src/Uno.UI` folder, run `msbuild /r`. This will make the nuget restore work properly.
- Once done, in VS4Mac, run the `SampleApp.macOS` project, which will build the dependencies and the app itself.

## Troubleshooting Source Generation

When building, if you're having build error messages that looks like one of those:

- `the targets [Microsoft.Build.Execution.TargetResult] failed to execute.`
- `error : Project has no references.`

There may be issues with the analysis of the project's source or configuration.

**Security notice: That `binlog` files produced below should never be published in a public location, as they may contain private information, such as source files. Make sure to provide those in private channels after review.**

The Source Generation tooling diagnostics can be enabled as follows:

- In the project file that fails to build, in the first `PropertyGroup` node, add the following content:
```xml
<UnoSourceGeneratorUnsecureBinLogEnabled>true</UnoSourceGeneratorUnsecureBinLogEnabled>
```
- Make to update or add the `Uno.SourceGenerationTasks` to the latest version
- When building, in the inner `obj` folders, a set of `.binlog` files are generated that can be opened with the [msbuild log viewer](http://msbuildlog.com/) and help the troubleshooting of the generation errors.
- Once you've reviewed the files, you may provide those as a reference for troubleshooting to the Uno maintainers.
- The best way to provide those file for troubleshooting is to make a zip archive of the whole solution folder without cleaning it, so it contains the proper diagnostics `.binlog` files.

**Make sure to remove the `UnoSourceGeneratorUnsecureBinLogEnabled` property once done.**
Loading

0 comments on commit c6830b7

Please sign in to comment.