projects / platform / upstream / dotnet / runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cd888c9)
Remove older TFMs from Microsoft.NETCore.App
authorWes Haggard <Wes.Haggard@microsoft.com>
Fri, 27 Apr 2018 22:37:09 +0000 (15:37 -0700)
committerWes Haggard <Wes.Haggard@microsoft.com>
Fri, 27 Apr 2018 22:37:09 +0000 (15:37 -0700)
Microsoft.NETCore.App will only support the target framework
that matches its major/minor version after this change.

Example: 2.2.x will only support netcoreapp2.2

Commit migrated from https://github.com/dotnet/core-setup/commit/fbfffea544b2ad9132028e64466e70200cc862f7

src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj patch | blob | history
src/installer/pkg/projects/Microsoft.NETCore.App/netcoreapp1.0.props [deleted file] patch | blob | history
src/installer/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props [deleted file] patch | blob | history

diff --git a/src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
index b206c6e..69e928b 100644 (file)
--- a/src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
+++ b/src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
@@ -19,27 +19,11 @@
     <IncludeAllRuntimePackagesInPlatformManifest Condition="'$(BuildFullPlatformManifest)' == 'true'">true</IncludeAllRuntimePackagesInPlatformManifest>
   </PropertyGroup>
 
-  <Import Project="netcoreapp1.0.props" />
-  <Import Project="netcoreapp1.1.props" />
-
   <!-- Identity / Reference package content -->
   <ItemGroup Condition="'$(PackageTargetRuntime)' == ''">
     <!-- reference RID specific packages to generate lineup -->
     <ProjectReference Include="@(Project)" />
 
-    <!-- reference dependencies from previous versions -->
-    <Dependency Include="@(NETCoreApp10Dependency)">
-      <TargetFramework>.NETCoreApp1.0</TargetFramework>
-    </Dependency>
-    <Dependency Include="@(NETCoreApp11Dependency)">
-      <TargetFramework>.NETCoreApp1.1</TargetFramework>
-    </Dependency>
-
-    <!-- temporarily disable netcoreapp2.0 until https://github.com/dotnet/core-setup/issues/2437 is fixed -->
-    <Dependency Include="_._">
-      <TargetFramework>.NETCoreApp2.0</TargetFramework>
-    </Dependency>
-
     <!-- references the host packages -->
     <Dependency Include="Microsoft.NETCore.DotNetHostPolicy">
        <Version>$(HostPolicyVersion)</Version>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.App/netcoreapp1.0.props b/src/installer/pkg/projects/Microsoft.NETCore.App/netcoreapp1.0.props
deleted file mode 100644 (file)
index fd7843f..0000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.App/netcoreapp1.0.props
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <NETCoreApp10Dependency Include="Microsoft.CodeAnalysis.CSharp">
-      <Version>1.3.0</Version>
-      <Exclude>Compile</Exclude>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="Microsoft.CodeAnalysis.VisualBasic">
-      <Version>1.3.0</Version>
-      <Exclude>Compile</Exclude>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="Microsoft.CSharp">
-      <Version>4.0.1</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="Microsoft.NETCore.DotNetHostPolicy">
-      <Version>1.0.5</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="Microsoft.NETCore.Platforms">
-      <Version>1.0.2</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="Microsoft.NETCore.Runtime.CoreCLR">
-      <Version>1.0.7</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="Microsoft.VisualBasic">
-      <Version>10.0.1</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="NETStandard.Library">
-      <Version>1.6.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="runtime.native.System.Security.Cryptography">
-      <Version>4.0.1</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Buffers">
-      <Version>4.0.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Collections.Immutable">
-      <Version>1.2.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.ComponentModel">
-      <Version>4.0.1</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.ComponentModel.Annotations">
-      <Version>4.1.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Diagnostics.DiagnosticSource">
-      <Version>4.0.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Diagnostics.Process">
-      <Version>4.1.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Dynamic.Runtime">
-      <Version>4.0.11</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Globalization.Extensions">
-      <Version>4.0.1</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.IO.FileSystem.Watcher">
-      <Version>4.0.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.IO.MemoryMappedFiles">
-      <Version>4.0.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.IO.UnmanagedMemoryStream">
-      <Version>4.0.1</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Linq.Expressions">
-      <Version>4.1.1</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Linq.Parallel">
-      <Version>4.0.1</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Linq.Queryable">
-      <Version>4.0.1</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Net.Http">
-      <Version>4.1.2</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Net.NameResolution">
-      <Version>4.0.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Net.Requests">
-      <Version>4.0.11</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Net.Security">
-      <Version>4.0.1</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Net.WebHeaderCollection">
-      <Version>4.0.1</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Numerics.Vectors">
-      <Version>4.1.1</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Reflection.DispatchProxy">
-      <Version>4.0.1</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Reflection.Metadata">
-      <Version>1.3.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Reflection.TypeExtensions">
-      <Version>4.1.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Resources.Reader">
-      <Version>4.0.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Runtime.Loader">
-      <Version>4.0.0</Version>
-      <Exclude>Compile</Exclude>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Security.Cryptography.Algorithms">
-      <Version>4.2.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Security.Cryptography.Encoding">
-      <Version>4.0.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Security.Cryptography.Primitives">
-      <Version>4.0.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Security.Cryptography.X509Certificates">
-      <Version>4.1.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Threading.Tasks.Dataflow">
-      <Version>4.6.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Threading.Tasks.Extensions">
-      <Version>4.0.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Threading.Tasks.Parallel">
-      <Version>4.0.1</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Threading.Thread">
-      <Version>4.0.0</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="System.Threading.ThreadPool">
-      <Version>4.0.10</Version>
-    </NETCoreApp10Dependency>
-    <NETCoreApp10Dependency Include="Libuv">
-      <Version>1.9.1</Version>
-    </NETCoreApp10Dependency>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props b/src/installer/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props
deleted file mode 100644 (file)
index f18acc6..0000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <NETCoreApp11Dependency Include="Libuv">
-      <Version>1.9.1</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="Microsoft.CodeAnalysis.CSharp">
-      <Version>1.3.0</Version>
-      <Exclude>Compile</Exclude>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="Microsoft.CodeAnalysis.VisualBasic">
-      <Version>1.3.0</Version>
-      <Exclude>Compile</Exclude>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="Microsoft.CSharp">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="Microsoft.DiaSymReader.Native">
-      <Version>1.4.1</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="Microsoft.NETCore.DotNetHostPolicy">
-      <Version>1.1.2</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="Microsoft.NETCore.Runtime.CoreCLR">
-      <Version>1.1.2</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="Microsoft.VisualBasic">
-      <Version>10.1.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="NETStandard.Library">
-      <Version>1.6.1</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="runtime.native.System.Security.Cryptography.OpenSsl">
-      <Version>4.3.1</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Buffers">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Collections.Immutable">
-      <Version>1.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.ComponentModel">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.ComponentModel.Annotations">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Diagnostics.DiagnosticSource">
-      <Version>4.3.1</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Diagnostics.Process">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Dynamic.Runtime">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Globalization.Extensions">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.IO.FileSystem.Watcher">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.IO.MemoryMappedFiles">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.IO.UnmanagedMemoryStream">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Linq.Expressions">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Linq.Parallel">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Linq.Queryable">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Net.Http">
-      <Version>4.3.2</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Net.NameResolution">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Net.Requests">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Net.Security">
-      <Version>4.3.1</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Net.WebHeaderCollection">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Numerics.Vectors">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Reflection.DispatchProxy">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Reflection.Metadata">
-      <Version>1.4.1</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Reflection.TypeExtensions">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Resources.Reader">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Runtime.Loader">
-      <Version>4.3.0</Version>
-      <Exclude>Compile</Exclude>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Security.Cryptography.Algorithms">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Security.Cryptography.Encoding">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Security.Cryptography.Primitives">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Security.Cryptography.X509Certificates">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Threading.Tasks.Dataflow">
-      <Version>4.7.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Threading.Tasks.Extensions">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Threading.Tasks.Parallel">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Threading.Thread">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-    <NETCoreApp11Dependency Include="System.Threading.ThreadPool">
-      <Version>4.3.0</Version>
-    </NETCoreApp11Dependency>
-  </ItemGroup>
-</Project>
\ No newline at end of file
Domain: Dotnet / Core;