This commit is contained in:
Oren Novotny 2017-08-27 15:56:35 -04:00
Родитель c80a57ba59
Коммит 98bb532f31
6 изменённых файлов: 26 добавлений и 154 удалений

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

@ -19,6 +19,10 @@
<IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
<IsUwpProject>$(MSBuildProjectName.Contains('Uwp'))</IsUwpProject>
<IsSampleProject>$(MSBuildProjectName.Contains('Sample'))</IsSampleProject>
<UwpMetaPackageVersion>5.3.4</UwpMetaPackageVersion>
<DefaultTargetPlatformVersion>15063</DefaultTargetPlatformVersion>
<DefaultTargetPlatformMinVersion>14393</DefaultTargetPlatformMinVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(IsUwpProject)' == 'true'">
@ -33,10 +37,12 @@
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
<EmbeddedResource Include="**\*.rd.xml" />
<Page Include="**\*.xaml" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
<Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
</ItemGroup>
<ItemGroup Condition="'$(IsUwpProject)' == 'true'">
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.0.7" PrivateAssets="all" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.0.8" PrivateAssets="all" />
</ItemGroup>
@ -57,5 +63,6 @@
BeforeTargets="_GenerateRestoreProjectSpec"
DependsOnTargets="GetBuildVersion"
Condition=" '$(NerdbankGitVersioningTasksPath)' != '' " />
</Project>

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

@ -2,11 +2,14 @@
<!-- UAP versions for uap10.0 where TPMV isn't implied -->
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'native'">
<TargetPlatformVersion>10.0.15063.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
<TargetPlatformVersion>10.0.$(DefaultTargetPlatformVersion).0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.$(DefaultTargetPlatformMinVersion).0</TargetPlatformMinVersion>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'native'">
<PackageReference Condition="'$(UseUwpMetaPackage)' == 'true'" Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="$(UwpMetaPackageVersion)" />
<SDKReference Condition="'$(UseWindowsDesktopSdk)' == 'true' " Include="WindowsDesktop, Version=$(TargetPlatformVersion)">
<Name>Windows Desktop Extensions for the UWP</Name>
</SDKReference>

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

@ -1,94 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{E7697922-9555-4CFB-AEE0-C5F4D657E559}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Toolkit.Uwp.DeveloperTools</RootNamespace>
<AssemblyName>Microsoft.Toolkit.Uwp.DeveloperTools</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion>10.0.15063.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TargetFramework>uap10.0</TargetFramework>
<Title>UWP Community Toolkit Developer Tools</Title>
<Description>This library provides XAML user controls and services to help developer building their app. It is part of the UWP Community Toolkit.</Description>
<PackageTags>UWP Toolkit Windows Controls XAML Developer Tools Accessibility</PackageTags>
<UseUwpMetaPackage>true</UseUwpMetaPackage>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\Microsoft.Toolkit.Uwp.DeveloperTools.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\Microsoft.Toolkit.Uwp.DeveloperTools.XML</DocumentationFile>
<RunCodeAnalysis>true</RunCodeAnalysis>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>5.3.4</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Compile Include="AlignmentGrid\AlignmentGrid.cs" />
<Compile Include="FocusTracker\FocusTracker.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="Properties\Microsoft.Toolkit.Uwp.DeveloperTools.rd.xml" />
</ItemGroup>
<ItemGroup>
<Page Include="FocusTracker\FocusTracker.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Themes\Generic.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Page>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<Target Name="Before_PrepareLibraryLayout" BeforeTargets="PrepareLibraryLayout">
<PropertyGroup>
<Saved_OutputPath>$(OutputPath)</Saved_OutputPath>
<Saved_TargetPath>$(TargetPath)</Saved_TargetPath>
<OutputPath>$(OutDir)</OutputPath>
<TargetPath>
</TargetPath>
</PropertyGroup>
</Target>
<Target Name="After_PrepareLibraryLayout" AfterTargets="PrepareLibraryLayout">
<PropertyGroup>
<OutputPath>$(Saved_OutputPath)</OutputPath>
<TargetPath>$(Saved_TargetPath)</TargetPath>
</PropertyGroup>
</Target>
</Project>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>

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

@ -1,28 +0,0 @@
// ******************************************************************
// Copyright (c) Microsoft. All rights reserved.
// This code is licensed under the MIT License (MIT).
// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
// ******************************************************************
using System;
using System.Reflection;
using System.Resources;
using System.Runtime.InteropServices;
[assembly: AssemblyTitle("Microsoft.Toolkit.Uwp.DeveloperTools")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Microsoft.Toolkit.Uwp.DeveloperTools")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: NeutralResourcesLanguage("en")]
[assembly: ComVisible(false)]

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

@ -5,11 +5,12 @@
<Title>UWP Community Toolkit</Title>
<Description>This package includes code only helpers such as Colors conversion tool, Storage file handling, a Stream helper class, etc.</Description>
<PackageTags>UWP Toolkit Windows</PackageTags>
<UseUwpMetaPackage>true</UseUwpMetaPackage>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="5.3.4" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<!-- TODO: Update to later version -->

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

@ -1,30 +0,0 @@
<?xml version="1.0"?>
<package>
<metadata>
<id>Microsoft.Toolkit.Uwp.DeveloperTools</id>
<version>$version$</version>
<title>UWP Community Toolkit Developer Tools</title>
<authors>Microsoft</authors>
<owners>microsoft, nugetuwptoolkit</owners>
<iconUrl>https://raw.githubusercontent.com/Microsoft/UWPCommunityToolkit/master/build/nuget.png</iconUrl>
<licenseUrl>https://github.com/Microsoft/UWPCommunityToolkit/blob/master/license.md</licenseUrl>
<projectUrl>https://github.com/Microsoft/UWPCommunityToolkit</projectUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>This library provides XAML user controls and services to help developer building their app. It is part of the UWP Community Toolkit.</description>
<releaseNotes>v1.4: https://github.com/Microsoft/UWPCommunityToolkit/releases/tag/v1.4.0</releaseNotes>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<tags>UWP Toolkit Windows Controls XAML Developer Tools Accessibility</tags>
<dependencies>
<dependency id="Microsoft.Toolkit.Uwp" version="$version$" />
<dependency id="Microsoft.Toolkit.Uwp.UI" version="$version$" />
<dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="5.3.3" />
</dependencies>
</metadata>
<files>
<file src="$binaries$\Microsoft.Toolkit.Uwp.DeveloperTools\Microsoft.Toolkit.Uwp.DeveloperTools.dll" target="lib\uap10.0" />
<file src="$binaries$\Microsoft.Toolkit.Uwp.DeveloperTools\Microsoft.Toolkit.Uwp.DeveloperTools.pdb" target="lib\uap10.0" />
<file src="$binaries$\Microsoft.Toolkit.Uwp.DeveloperTools\Microsoft.Toolkit.Uwp.DeveloperTools.pri" target="lib\uap10.0" />
<file src="$binaries$\Microsoft.Toolkit.Uwp.DeveloperTools\Microsoft.Toolkit.Uwp.DeveloperTools.xml" target="lib\uap10.0" />
<file src="$binaries$\Microsoft.Toolkit.Uwp.DeveloperTools\Microsoft.Toolkit.Uwp.DeveloperTools\**\*.*" target="lib\uap10.0\Microsoft.Toolkit.Uwp.DeveloperTools" />
</files>
</package>