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:
Diffstat (limited to 'src/System.Runtime')
-rw-r--r--src/System.Runtime/ref/4.1.0/System.Runtime.depproj13
-rw-r--r--src/System.Runtime/src/Configurations.props1
-rw-r--r--src/System.Runtime/src/System.Runtime.csproj10
3 files changed, 3 insertions, 21 deletions
diff --git a/src/System.Runtime/ref/4.1.0/System.Runtime.depproj b/src/System.Runtime/ref/4.1.0/System.Runtime.depproj
deleted file mode 100644
index e3932a41e6..0000000000
--- a/src/System.Runtime/ref/4.1.0/System.Runtime.depproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
- <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
- <PropertyGroup>
- <AssemblyVersion>4.1.0.0</AssemblyVersion>
- <OutputType>Library</OutputType>
- <NuGetTargetMoniker>.NETStandard,Version=v1.5</NuGetTargetMoniker>
- </PropertyGroup>
- <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/src/Configurations.props b/src/System.Runtime/src/Configurations.props
index f71bd28c11..d3acc59a8a 100644
--- a/src/System.Runtime/src/Configurations.props
+++ b/src/System.Runtime/src/Configurations.props
@@ -2,7 +2,6 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
- netstandard1.5;
net461-Windows_NT;
uap101aot-Windows_NT;
netcoreapp1.2corert-Windows_NT;
diff --git a/src/System.Runtime/src/System.Runtime.csproj b/src/System.Runtime/src/System.Runtime.csproj
index 8749c28b00..32b3ec4116 100644
--- a/src/System.Runtime/src/System.Runtime.csproj
+++ b/src/System.Runtime/src/System.Runtime.csproj
@@ -4,14 +4,10 @@
<PropertyGroup>
<ProjectGuid>{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}</ProjectGuid>
<AssemblyName>System.Runtime</AssemblyName>
- <AssemblyVersion Condition="'$(TargetGroup)'=='netstandard1.5'">4.1.1.0</AssemblyVersion>
- <ContractProject Condition="'$(AssemblyVersion)'=='4.1.1.0'">../ref/4.1.0/System.Runtime.depproj</ContractProject>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<GenFacadesArgs Condition="'$(TargetGroup)' == 'uap101aot' Or '$(TargetGroup)' == 'netcoreapp1.2corert'">$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.5-Debug|AnyCPU'" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.5-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net461-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net461-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='uap101aot-Windows_NT-Debug|AnyCPU'" />
@@ -38,18 +34,18 @@
<Compile Include="System\Runtime\CompilerServices\Attributes.cs" />
<Compile Include="System\IO\FileAttributes.cs" />
</ItemGroup>
- <ItemGroup Condition="'$(TargetGroup)' != 'net461' and '$(TargetGroup)' != 'netstandard1.5'">
+ <ItemGroup Condition="'$(TargetGroup)' != 'net461'">
<Compile Include="System\Runtime\NgenServicingAttributes.cs" />
<Compile Include="System\IO\HandleInheritability.cs" />
<Compile Include="System\Runtime\ConstrainedExecution\PrePrepareMethodAttribute.cs" />
<Compile Include="System\Runtime\CompilerServices\SpecialNameAttribute.cs" />
<Compile Include="System\Threading\WaitHandleExtensions.cs" />
</ItemGroup>
- <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.5' or '$(TargetGroup)' == 'netstandard'">
+ <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'">
<Compile Include="System\ComponentModel\DefaultValueAttribute.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.csproj" Condition="'$(TargetGroup)' == 'netstandard1.5' or '$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'uap101aot'" />
+ <ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.csproj" Condition="'$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'uap101aot'" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' != 'net461'">
<TargetingPackReference Include="System.Private.CoreLib" />