diff options
| author | Wes Haggard <Wes.Haggard@microsoft.com> | 2017-02-03 19:44:52 +0300 |
|---|---|---|
| committer | Wes Haggard <Wes.Haggard@microsoft.com> | 2017-02-03 19:45:51 +0300 |
| commit | 59dbd07dd0dc2c95c02025f2f7410492a2a71a01 (patch) | |
| tree | 5dbef832f36cead1726e760a3e0315f746e6c21f | |
| parent | 2ac9efa1502c84a63895d74ea7f908239e431592 (diff) | |
Move WinRT targeting pack under external
| -rw-r--r-- | external/winrt/Configurations.props (renamed from src/Microsoft.TargetingPack.Private.WinRT/ref/Configurations.props) | 0 | ||||
| -rw-r--r-- | external/winrt/project.json.template (renamed from src/Microsoft.TargetingPack.Private.WinRT/ref/project.json) | 2 | ||||
| -rw-r--r-- | external/winrt/winrt.depproj (renamed from src/Microsoft.TargetingPack.Private.WinRT/ref/Microsoft.TargetingPack.Private.WinRT.depproj) | 9 | ||||
| -rw-r--r-- | src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/src/Microsoft.TargetingPack.Private.WinRT/ref/Configurations.props b/external/winrt/Configurations.props index c398e42e89..c398e42e89 100644 --- a/src/Microsoft.TargetingPack.Private.WinRT/ref/Configurations.props +++ b/external/winrt/Configurations.props diff --git a/src/Microsoft.TargetingPack.Private.WinRT/ref/project.json b/external/winrt/project.json.template index 1c4ed39edf..8ccca2018a 100644 --- a/src/Microsoft.TargetingPack.Private.WinRT/ref/project.json +++ b/external/winrt/project.json.template @@ -3,6 +3,6 @@ "Microsoft.TargetingPack.Private.WinRT": "1.0.3" }, "frameworks": { - "netstandard1.0": {} + "{TFM}": {} } } diff --git a/src/Microsoft.TargetingPack.Private.WinRT/ref/Microsoft.TargetingPack.Private.WinRT.depproj b/external/winrt/winrt.depproj index c1c2172d72..ca0c94b2fa 100644 --- a/src/Microsoft.TargetingPack.Private.WinRT/ref/Microsoft.TargetingPack.Private.WinRT.depproj +++ b/external/winrt/winrt.depproj @@ -4,12 +4,9 @@ <PropertyGroup> <AssemblyName>Windows</AssemblyName> <TargetExt>.winmd</TargetExt> - <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker> + <IsReferenceAssembly>true</IsReferenceAssembly> + <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem> + <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj b/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj index a9534319c8..75ffa0d0fa 100644 --- a/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj +++ b/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj @@ -24,7 +24,7 @@ <Compile Include="System.Runtime.WindowsRuntime.Manual.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\Microsoft.TargetingPack.Private.WinRT\ref\Microsoft.TargetingPack.Private.WinRT.depproj" /> + <ProjectReference Include="..\..\..\external\winrt\winrt.depproj" /> <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> |