unoplatform
/
Uno.CodeGen
зеркало из https://github.com/unoplatform/Uno.CodeGen.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #93 from nventive/dev/xygu/cherry-picked-beta-z-fixes 

Dev/xygu/cherry picked beta z fixes
This commit is contained in:
Xiaotian Gu 2018-12-14 10:34:59 -05:00 коммит произвёл GitHub
Родитель 9500d9bf46 b40a5d57b8
Коммит 1109f83882
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
11 изменённых файлов: 28 добавлений и 24 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
src/Uno.ClassLifecycle/Uno.ClassLifecycle.csproj
Просмотреть файл

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

2
src/Uno.CodeGen.ClassLifecycle/Build/Uno.CodeGen.ClassLifecycle.props
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<ItemGroup>
<SourceGenerator Include="$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net46\Uno.CodeGen.ClassLifecycle.dll"
<SourceGenerator Include="$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net461\Uno.CodeGen.ClassLifecycle.dll"
Condition="Exists('$(MSBuildThisFileDirectory)..\bin')" />
<SourceGenerator Include="$(MSBuildThisFileDirectory)..\tools\Uno.CodeGen.ClassLifecycle.dll"
Condition="Exists('$(MSBuildThisFileDirectory)..\tools')" />

10
src/Uno.CodeGen.ClassLifecycle/Uno.CodeGen.ClassLifecycle.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net46;netstandard1.3;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net461;netstandard1.3;netstandard2.0</TargetFrameworks>
<IsTool>true</IsTool>
<Product>Generator of class lifecycle</Product>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@ -22,19 +22,19 @@ This package is part of the Uno.CodeGen to generate classes lifecycle methods in
<Import Project="..\Uno.Common.props" />
<ItemGroup Condition="'$(TargetFramework)'=='net46'">
<ItemGroup Condition="'$(TargetFramework)'=='net461'">
<PackageReference Include="System.ValueTuple" Version="4.4.0" PrivateAssets="all" />
<PackageReference Include="Uno.RoslynHelpers" Version="1.2.0-dev.10" PrivateAssets="all" />
<PackageReference Include="Uno.SourceGeneration" Version="1.29.0-dev.157" PrivateAssets="all" />
<PackageReference Include="Uno.SourceGeneration" Version="1.29.0-beta.202" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.SourceGenerationTasks" Version="1.29.0-dev.157" PrivateAssets="none">
<PackageReference Include="Uno.SourceGenerationTasks" Version="1.29.0-beta.202" PrivateAssets="none">
<NoWarn>NU1701</NoWarn>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='net46'">
<ItemGroup Condition="'$(TargetFramework)'!='net461'">
<Compile Remove="**\*.cs" />
<None Include="**\*.cs" Exclude="obj\**\*.cs;bin\**\.cs" />
</ItemGroup>

6
src/Uno.CodeGen.Tests.ExternalClasses/Uno.CodeGen.Tests.ExternalClasses.csproj
Просмотреть файл

@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net46;netstandard2.0;netstandard1.3</TargetFrameworks>
<TargetFrameworks>net461;netstandard2.0;netstandard1.3</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<SourceGenerator Include="..\Uno.CodeGen\bin\$(Configuration)\net46\Uno.CodeGen.dll" />
<SourceGenerator Include="..\Uno.CodeGen\bin\$(Configuration)\net461\Uno.CodeGen.dll" />
</ItemGroup>
<Import Project="..\Uno.CodeGen\build\Uno.CodeGen.props" />
<ItemGroup>
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
<PackageReference Include="Uno.SourceGenerationTasks" Version="1.29.0-dev.157" />
<PackageReference Include="Uno.SourceGenerationTasks" Version="1.29.0-beta.202" />
</ItemGroup>
<ItemGroup>

8
src/Uno.CodeGen.Tests/Uno.CodeGen.Tests.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net46</TargetFramework>
<TargetFramework>net461</TargetFramework>
<IsPackable>false</IsPackable>
<NoWarn>1701;1702;1705;NU1701</NoWarn>
<CodeAnalysisRuleSet>Uno.CodeGen.Tests.ruleset</CodeAnalysisRuleSet>
@ -9,7 +9,7 @@
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
<SourceGenerator Include="..\Uno.CodeGen\bin\$(Configuration)\net46\Uno.CodeGen.dll" />
<SourceGenerator Include="..\Uno.CodeGen\bin\$(Configuration)\net461\Uno.CodeGen.dll" />
</ItemGroup>
<ItemGroup>
@ -20,8 +20,8 @@
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
<PackageReference Include="Uno.Core" Version="1.26.0-dev.58" />
<PackageReference Include="Uno.SourceGenerationTasks" Version="1.29.0-dev.157">
<PackageReference Include="Uno.Core" Version="1.26.0-beta.64" />
<PackageReference Include="Uno.SourceGenerationTasks" Version="1.29.0-beta.202">
<NoWarn>NU1701</NoWarn>
</PackageReference>

10
src/Uno.CodeGen/Uno.CodeGen.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net46;netstandard1.3;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net461;netstandard1.3;netstandard2.0</TargetFrameworks>
<IsTool>true</IsTool>
<NoWarn>1701;1702;1705;NU1701</NoWarn>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@ -18,20 +18,20 @@
<Import Project="..\Uno.Common.props" />
<ItemGroup Condition="'$(TargetFramework)'=='net46'">
<ItemGroup Condition="'$(TargetFramework)'=='net461'">
<PackageReference Include="System.ValueTuple" Version="4.4.0" PrivateAssets="all" />
<PackageReference Include="Uno.RoslynHelpers" Version="1.2.0-dev.10" PrivateAssets="all" />
<PackageReference Include="Uno.SourceGeneration" Version="1.29.0-dev.157" PrivateAssets="all" />
<PackageReference Include="Uno.SourceGeneration" Version="1.29.0-beta.202" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis" Version="2.3.0" PrivateAssets="all" />
<PackageReference Include="Uno.SourceGenerationTasks" Version="1.29.0-dev.157" PrivateAssets="none">
<PackageReference Include="Uno.SourceGenerationTasks" Version="1.29.0-beta.202" PrivateAssets="none">
<NoWarn>NU1701</NoWarn>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='net46'">
<ItemGroup Condition="'$(TargetFramework)'!='net461'">
<Compile Remove="**\*.cs" />
<None Include="**\*.cs" Exclude="bin\**\*.cs;obj\**\*.cs" />
</ItemGroup>

2
src/Uno.CodeGen/build/Uno.CodeGen.props
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<Project ToolsVersion="15.0">
<ItemGroup>
<SourceGenerator Include="$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net46\Uno.CodeGen.dll"
<SourceGenerator Include="$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net461\Uno.CodeGen.dll"
Condition="Exists('$(MSBuildThisFileDirectory)..\bin')" />
<SourceGenerator Include="$(MSBuildThisFileDirectory)..\tools\Uno.CodeGen.dll"
Condition="Exists('$(MSBuildThisFileDirectory)..\tools')" />

2
src/Uno.Common.props
Просмотреть файл

@ -9,7 +9,7 @@
<PropertyGroup>
<_OverrideTargetFramework>$(TargetFramework)</_OverrideTargetFramework>
<_TargetNugetFolder Condition="'$(IsTool)'=='true' AND '$(TargetFramework)' == 'net46'">$(USERPROFILE)\.nuget\packages\$(AssemblyName)\$(NugetOverrideVersion)\tools</_TargetNugetFolder>
<_TargetNugetFolder Condition="'$(IsTool)'=='true' AND '$(TargetFramework)' == 'net461'">$(USERPROFILE)\.nuget\packages\$(AssemblyName)\$(NugetOverrideVersion)\tools</_TargetNugetFolder>
<_TargetNugetFolder Condition="'$(IsTool)'!='true'">$(USERPROFILE)\.nuget\packages\$(AssemblyName)\$(NugetOverrideVersion)\lib\$(_OverrideTargetFramework)</_TargetNugetFolder>
</PropertyGroup>
<ItemGroup>

2
src/Uno.Equality/Uno.Equality.csproj
Просмотреть файл

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

6
src/Uno.Immutables/Uno.Immutables.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net46;netstandard1.3;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net461;netstandard1.3;netstandard2.0</TargetFrameworks>
<Product>Immutable Declarations</Product>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
@ -21,6 +21,10 @@ This package is part of the Uno.CodeGen to generate immutable entities in your p
</PropertyGroup>
<Import Project="..\Uno.Common.props" />
<ItemGroup>
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Uno.Equality\Uno.Equality.csproj" />

2
src/Uno.Injectable/Uno.Injectable.csproj
Просмотреть файл

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