diff options
author | Eric St. John <ericstj@microsoft.com> | 2015-10-22 03:03:48 +0300 |
---|---|---|
committer | Eric St. John <ericstj@microsoft.com> | 2015-10-22 03:03:48 +0300 |
commit | 38f8d7a3ca1ee819c2b8eabb1c07ee4e99683c97 (patch) | |
tree | 572ac6a9dc7723501cf52c6e197b57b3d5c20738 /src/System.Runtime.WindowsRuntime | |
parent | 668d93669e219b6e52dfe5ed171a19a75e7388ea (diff) |
Update dnx to v1.0.0-rc1-15838, update dotnet projects to generations
We need a new DNX to understand the latest packages.
We also need to move all "dotnet" projects to use dotnetX.X (generations)
now that the packages no longer have "dotnet" assets.
The new version of DNX dropped support for the aspnetcore
so I needed to update a few projects/packages that depended
on old package versions that had this moniker.
[tfs-changeset: 1540388]
Diffstat (limited to 'src/System.Runtime.WindowsRuntime')
5 files changed, 82 insertions, 6 deletions
diff --git a/src/System.Runtime.WindowsRuntime/ref/4.0.0/System.Runtime.WindowsRuntime.depproj b/src/System.Runtime.WindowsRuntime/ref/4.0.0/System.Runtime.WindowsRuntime.depproj index a7e32bbae2..66b3818eba 100644 --- a/src/System.Runtime.WindowsRuntime/ref/4.0.0/System.Runtime.WindowsRuntime.depproj +++ b/src/System.Runtime.WindowsRuntime/ref/4.0.0/System.Runtime.WindowsRuntime.depproj @@ -5,6 +5,7 @@ <AssemblyVersion>4.0.0.0</AssemblyVersion> <OutputType>Library</OutputType> <PackageTargetFramework>dotnet5.1</PackageTargetFramework> + <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <None Include="project.json" /> diff --git a/src/System.Runtime.WindowsRuntime/ref/4.0.0/project.json b/src/System.Runtime.WindowsRuntime/ref/4.0.0/project.json index 69e669bdc0..28a49604ee 100644 --- a/src/System.Runtime.WindowsRuntime/ref/4.0.0/project.json +++ b/src/System.Runtime.WindowsRuntime/ref/4.0.0/project.json @@ -3,6 +3,6 @@ "System.Runtime.WindowsRuntime": "4.0.0" }, "frameworks": { - "dotnet": {} + "dotnet5.1": {} } }
\ 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 605d38078e..936aaa44d4 100644 --- a/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj +++ b/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj @@ -16,6 +16,7 @@ <AssemblyVersion>4.0.11.0</AssemblyVersion> <OutputType>Library</OutputType> <PackageTargetFramework>dotnet5.3</PackageTargetFramework> + <NuGetTargetMoniker>.NETPlatform,Version=v5.3</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="System.Runtime.WindowsRuntime.cs" /> @@ -29,4 +30,4 @@ <None Include="project.json" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.WindowsRuntime/ref/project.json b/src/System.Runtime.WindowsRuntime/ref/project.json index e6ed0ec460..38223dd31f 100644 --- a/src/System.Runtime.WindowsRuntime/ref/project.json +++ b/src/System.Runtime.WindowsRuntime/ref/project.json @@ -5,6 +5,6 @@ "System.Threading.Tasks": "4.0.0" }, "frameworks": { - "dotnet": {} + "dotnet5.3": {} } }
\ No newline at end of file diff --git a/src/System.Runtime.WindowsRuntime/ref/project.lock.json b/src/System.Runtime.WindowsRuntime/ref/project.lock.json index 416e2ef569..628c46e7a0 100644 --- a/src/System.Runtime.WindowsRuntime/ref/project.lock.json +++ b/src/System.Runtime.WindowsRuntime/ref/project.lock.json @@ -1,8 +1,82 @@ { "locked": true, - "version": 1, + "version": 2, "targets": { - ".NETPlatform,Version=v5.0": { + ".NETPlatform,Version=v5.3": { + "System.IO/4.0.0": { + "type": "package", + "dependencies": { + "System.Runtime": "4.0.0", + "System.Text.Encoding": "4.0.0", + "System.Threading.Tasks": "4.0.0" + }, + "compile": { + "ref/dotnet/System.IO.dll": {} + } + }, + "System.Runtime/4.0.0": { + "type": "package", + "compile": { + "ref/dotnet/System.Runtime.dll": {} + } + }, + "System.Text.Encoding/4.0.0": { + "type": "package", + "dependencies": { + "System.Runtime": "4.0.0" + }, + "compile": { + "ref/dotnet/System.Text.Encoding.dll": {} + } + }, + "System.Threading.Tasks/4.0.0": { + "type": "package", + "dependencies": { + "System.Runtime": "4.0.0" + }, + "compile": { + "ref/dotnet/System.Threading.Tasks.dll": {} + } + } + }, + ".NETPlatform,Version=v5.3/win7-x86": { + "System.IO/4.0.0": { + "type": "package", + "dependencies": { + "System.Runtime": "4.0.0", + "System.Text.Encoding": "4.0.0", + "System.Threading.Tasks": "4.0.0" + }, + "compile": { + "ref/dotnet/System.IO.dll": {} + } + }, + "System.Runtime/4.0.0": { + "type": "package", + "compile": { + "ref/dotnet/System.Runtime.dll": {} + } + }, + "System.Text.Encoding/4.0.0": { + "type": "package", + "dependencies": { + "System.Runtime": "4.0.0" + }, + "compile": { + "ref/dotnet/System.Text.Encoding.dll": {} + } + }, + "System.Threading.Tasks/4.0.0": { + "type": "package", + "dependencies": { + "System.Runtime": "4.0.0" + }, + "compile": { + "ref/dotnet/System.Threading.Tasks.dll": {} + } + } + }, + ".NETPlatform,Version=v5.3/win7-x64": { "System.IO/4.0.0": { "type": "package", "dependencies": { @@ -240,6 +314,6 @@ "System.IO >= 4.0.0", "System.Threading.Tasks >= 4.0.0" ], - ".NETPlatform,Version=v5.0": [] + ".NETPlatform,Version=v5.3": [] } }
\ No newline at end of file |