Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corefx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric St. John <ericstj@microsoft.com>2016-02-24 07:18:17 +0300
committerEric St. John <ericstj@microsoft.com>2016-02-24 07:18:17 +0300
commit4435f9f2776ae007e05f4454675e56cf76a51975 (patch)
tree7b3ea7416654220750946b02fce952b269a7692f /src/System.Numerics.Vectors
parente5e7e23fe52188e3d09470bc51fd0d80f8d2354f (diff)
Rename "dotnet" to "NETStandard"
Fixes https://github.com/dotnet/corefx/issues/5707 We are changing the .NET packages to no longer use the ‘dotnet’, ‘dotnet5.x’, and ‘dnxcore50’ monikers. This is thee first stage of the change for dotnet->netstandard. The replacements are as follows Old moniker | New moniker ----------------- | ------------------ dotnet5.x | netstandard1.y (where y = x -1) DNXCore50 | netstandardapp1.5 dotnet | netstandard1.3 To prepare for this change you can do the following to your project.json. This change will require a recent build of NuGet or dotnet.exe and can be done prior to consuming the packages with the breaking change. These packages will not work with DNX. For a project targeting dotnet5.6 ``` "frameworks": { "netstandard1.5": { "imports": [ "dotnet5.6" ] } }, ``` For a project targeting dnxcore50 ``` "frameworks": { "netstandardapp1.5": { "imports": [ "dnxcore50", "portable-net45+win8" ] } }, ``` [tfs-changeset: 1578321]
Diffstat (limited to 'src/System.Numerics.Vectors')
-rw-r--r--src/System.Numerics.Vectors/ref/4.0.0/System.Numerics.Vectors.depproj6
-rw-r--r--src/System.Numerics.Vectors/ref/4.0.0/project.json7
-rw-r--r--src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj8
-rw-r--r--src/System.Numerics.Vectors/ref/project.json6
-rw-r--r--src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj8
-rw-r--r--src/System.Numerics.Vectors/src/project.json11
6 files changed, 28 insertions, 18 deletions
diff --git a/src/System.Numerics.Vectors/ref/4.0.0/System.Numerics.Vectors.depproj b/src/System.Numerics.Vectors/ref/4.0.0/System.Numerics.Vectors.depproj
index d989b45789..936df44f24 100644
--- a/src/System.Numerics.Vectors/ref/4.0.0/System.Numerics.Vectors.depproj
+++ b/src/System.Numerics.Vectors/ref/4.0.0/System.Numerics.Vectors.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<OutputType>Library</OutputType>
- <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
- <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+ <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+ <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
</PropertyGroup>
<ItemGroup>
<None Include="project.json" />
diff --git a/src/System.Numerics.Vectors/ref/4.0.0/project.json b/src/System.Numerics.Vectors/ref/4.0.0/project.json
index 39056e65e1..c525f988e5 100644
--- a/src/System.Numerics.Vectors/ref/4.0.0/project.json
+++ b/src/System.Numerics.Vectors/ref/4.0.0/project.json
@@ -3,8 +3,11 @@
"System.Numerics.Vectors": "4.0.0"
},
"frameworks": {
- "dotnet5.4": {
- "imports": "portable-net45+win8"
+ "netstandard1.3": {
+ "imports": [
+ "portable-net45+win8",
+ "dotnet5.4"
+ ]
}
}
} \ No newline at end of file
diff --git a/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj b/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj
index 65f08d9e6f..0f1eabbce1 100644
--- a/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj
+++ b/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.1.1.0</AssemblyVersion>
<OutputType>Library</OutputType>
- <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+ <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
<!-- remove when fixing https://github.com/dotnet/corefx/issues/5900 -->
<SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework>
</PropertyGroup>
<ItemGroup Condition="'$(PackageTargetFramework)' == ''">
- <PackageDestination Include="ref/dotnet5.2">
- <TargetFramework>dotnet5.2</TargetFramework>
+ <PackageDestination Include="ref/netstandard1.1">
+ <TargetFramework>netstandard1.1</TargetFramework>
</PackageDestination>
<PackageDestination Include="ref/portable-net45+win8">
<TargetFramework>portable-net45+win8</TargetFramework>
diff --git a/src/System.Numerics.Vectors/ref/project.json b/src/System.Numerics.Vectors/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.Numerics.Vectors/ref/project.json
+++ b/src/System.Numerics.Vectors/ref/project.json
@@ -3,6 +3,10 @@
"System.Runtime": "4.0.0"
},
"frameworks": {
- "dotnet5.4": {}
+ "netstandard1.3": {
+ "imports": [
+ "dotnet5.4"
+ ]
+ }
}
} \ No newline at end of file
diff --git a/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj b/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
index 2e8ad6bf5b..5137338db1 100644
--- a/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
+++ b/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
@@ -9,12 +9,12 @@
<DocumentationFile>$(OutputPath)System.Numerics.Vectors.xml</DocumentationFile>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly>
- <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+ <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
</PropertyGroup>
<ItemGroup Condition="'$(PackageTargetFramework)' == ''">
- <PackageDestination Include="lib/dotnet5.4">
- <TargetFramework>dotnet5.4</TargetFramework>
+ <PackageDestination Include="lib/netstandard1.3">
+ <TargetFramework>netstandard1.3</TargetFramework>
</PackageDestination>
<PackageDestination Include="lib/portable-net45+win8">
<TargetFramework>portable-net45+win8</TargetFramework>
diff --git a/src/System.Numerics.Vectors/src/project.json b/src/System.Numerics.Vectors/src/project.json
index 8ccfcbb218..2cc89b41b6 100644
--- a/src/System.Numerics.Vectors/src/project.json
+++ b/src/System.Numerics.Vectors/src/project.json
@@ -1,6 +1,6 @@
{
"frameworks": {
- "dotnet5.4": {
+ "netstandard1.3": {
"dependencies": {
"System.Runtime": "4.0.0",
"System.Resources.ResourceManager": "4.0.0",
@@ -8,11 +8,14 @@
"System.Runtime.Extensions": "4.0.0",
"System.Diagnostics.Tools": "4.0.0",
"System.Diagnostics.Contracts": "4.0.0"
- }
+ },
+ "imports": [
+ "dotnet5.4"
+ ]
},
- "net46":{
+ "net46": {
"dependencies": {
- "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1",
+ "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"
}
}
}