Merge pull request #34 from nventive/master

Fast-forward "stable" to latest "master"
This commit is contained in:
Carl de Billy 2018-02-27 10:51:16 -05:00 коммит произвёл GitHub
Родитель cd70deda00 24f31ae765
Коммит b9197787d2
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
12 изменённых файлов: 29 добавлений и 24 удалений

5
.gitignore поставляемый
Просмотреть файл

@ -228,5 +228,6 @@ Resource.Designer.cs
*.bak
*/nuget_version_override.txt
/src/crosstargeting_override.props
/build/tools
/build/*.nupkg
/build/tools/**
!build/tools/packages.config
/build/*.nupkg

Просмотреть файл

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cake" version="0.24.0" />
</packages>

Просмотреть файл

@ -1,6 +1,6 @@
assembly-versioning-scheme: MajorMinorPatch
mode: ContinuousDeployment
next-version: 1.20.0
next-version: 1.20.1
continuous-delivery-fallback-tag: ""
branches:
master:
@ -12,4 +12,4 @@ branches:
projects/(.*?):
tag: proj-{BranchName}
ignore:
sha: []
sha: []

Просмотреть файл

@ -6,8 +6,8 @@
| Target | Branch | Status | Recent builds | Recommended Nuget packages version |
| ------ | ------ | ------ | ------ | ------ |
| `development` | [master](https://github.com/nventive/Uno.CodeGen/tree/master) | [![Build status](https://ci.appveyor.com/api/projects/status/bh83u4i2lp0hrg8r/branch/master?svg=true)](https://ci.appveyor.com/project/nventivedevops/uno-codegen/branch/master) | ![Build Stats](https://buildstats.info/appveyor/chart/nventivedevops/uno-codegen?branch=master&includeBuildsFromPullRequest=false) | [![NuGet](https://img.shields.io/nuget/v/Uno.CodeGen.svg)](https://www.nuget.org/packages/Uno.CodeGen/) |
| `stable` | [stable](https://github.com/nventive/Uno.CodeGen/tree/stable) | (no build yet) | (not published yet) |
| `development` | [master](https://github.com/nventive/Uno.CodeGen/tree/master) | [![Build status](https://ci.appveyor.com/api/projects/status/bh83u4i2lp0hrg8r/branch/master?svg=true)](https://ci.appveyor.com/project/nventivedevops/uno-codegen/branch/master) | ![Build Stats](https://buildstats.info/appveyor/chart/nventivedevops/uno-codegen?branch=master&includeBuildsFromPullRequest=false) | [![NuGet](https://buildstats.info/nuget/Uno.CodeGen?includePreReleases=true)](https://www.nuget.org/packages/Uno.CodeGen/) |
| `stable` | [stable](https://github.com/nventive/Uno.CodeGen/tree/stable) | [![Build status](https://ci.appveyor.com/api/projects/status/bh83u4i2lp0hrg8r/branch/stable?svg=true)](https://ci.appveyor.com/project/nventivedevops/uno-codegen/branch/stable) | ![Build Stats](https://buildstats.info/appveyor/chart/nventivedevops/uno-codegen?branch=stable&includeBuildsFromPullRequest=false) | [![NuGet](https://buildstats.info/nuget/Uno.CodeGen?includePreReleases=false)](https://www.nuget.org/packages/Uno.CodeGen/) |
## Available Generators

Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard1.0;netstandard2.0;net46</TargetFrameworks>
<TargetFrameworks>net46;netstandard1.3;netstandard2.0</TargetFrameworks>
<Product>Object life cycle declaration</Product>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>

Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net46;netstandard1.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net46;netstandard1.3;netstandard2.0</TargetFrameworks>
<IsTool>true</IsTool>
<Product>Generator of class lifecycle</Product>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@ -22,12 +22,12 @@ This package is part of the Uno.CodeGen to generate classes lifecycle methods in
<ItemGroup Condition="'$(TargetFramework)'=='net46'">
<PackageReference Include="System.ValueTuple" Version="4.4.0" PrivateAssets="all" />
<PackageReference Include="Uno.RoslynHelpers" Version="1.1.0-dev.5" PrivateAssets="all" />
<PackageReference Include="Uno.SourceGeneration" Version="1.20.0-dev.17" PrivateAssets="all" />
<PackageReference Include="Uno.RoslynHelpers" Version="1.1.1" PrivateAssets="all" />
<PackageReference Include="Uno.SourceGeneration" Version="1.20.1" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.SourceGenerationTasks" Version="1.20.0-dev.17" PrivateAssets="none">
<PackageReference Include="Uno.SourceGenerationTasks" Version="1.20.1" PrivateAssets="none">
<NoWarn>NU1701</NoWarn>
</PackageReference>
</ItemGroup>

Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net46;netstandard2.0;netstandard1.6</TargetFrameworks>
<TargetFrameworks>net46;netstandard2.0;netstandard1.3</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>
@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="System.ComponentModel.Annotations" Version="4.4.1" />
<PackageReference Include="Uno.SourceGenerationTasks" Version="1.20.0-dev.17" />
<PackageReference Include="Uno.SourceGenerationTasks" Version="1.20.1" />
</ItemGroup>
<ItemGroup>

Просмотреть файл

@ -17,14 +17,14 @@
<Import Project="..\Uno.CodeGen.ClassLifecycle\Build\Uno.CodeGen.ClassLifecycle.props" />
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.0.0" />
<PackageReference Include="FluentAssertions" Version="5.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
<PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.4.1" />
<PackageReference Include="Uno.Core" Version="1.20.0-dev.8" />
<PackageReference Include="Uno.SourceGenerationTasks" Version="1.20.0-dev.17" />
<PackageReference Include="Uno.Core" Version="1.20.2" />
<PackageReference Include="Uno.SourceGenerationTasks" Version="1.20.1" />
</ItemGroup>
<ItemGroup>

Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net46;netstandard1.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net46;netstandard1.3;netstandard2.0</TargetFrameworks>
<IsTool>true</IsTool>
<NoWarn>1701;1702;1705;NU1701</NoWarn>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@ -16,12 +16,12 @@
<ItemGroup Condition="'$(TargetFramework)'=='net46'">
<PackageReference Include="System.ValueTuple" Version="4.4.0" PrivateAssets="all" />
<PackageReference Include="Uno.RoslynHelpers" Version="1.1.0-dev.5" PrivateAssets="all" />
<PackageReference Include="Uno.SourceGeneration" Version="1.20.0-dev.17" PrivateAssets="all" />
<PackageReference Include="Uno.RoslynHelpers" Version="1.1.1" PrivateAssets="all" />
<PackageReference Include="Uno.SourceGeneration" Version="1.20.1" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.SourceGenerationTasks" Version="1.20.0-dev.17" PrivateAssets="none" />
<PackageReference Include="Uno.SourceGenerationTasks" Version="1.20.1" PrivateAssets="none" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='net46'">

Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard1.0;netstandard2.0;net46</TargetFrameworks>
<TargetFrameworks>net46;netstandard1.3;netstandard2.0</TargetFrameworks>
<Product>Equality Declarations</Product>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>

Просмотреть файл

@ -24,7 +24,7 @@ namespace Uno
/// <summary>
/// Get an immutable version from the current state of the mutable object.
/// </summary>
#if !NETSTANDARD1_0
#if !NETSTANDARD1_3
[System.Diagnostics.Contracts.Pure]
#endif
TImmutable ToImmutable();

Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard1.0;netstandard2.0;net46</TargetFrameworks>
<TargetFrameworks>net46;netstandard1.3;netstandard2.0</TargetFrameworks>
<Product>Immutable Declarations</Product>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>