summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorchcosta <chcosta@microsoft.com>2017-03-08 16:07:32 -0800
committerGitHub <noreply@github.com>2017-03-08 16:07:32 -0800
commit8f23fca0ff57c97707d4f6b5068e8044d2dcc13c (patch)
treec41607d9ef3007cd1107a075f7aa700916589179 /src
parent5bdc20368230e271000109319f3e3236e855d374 (diff)
downloadcoreclr-8f23fca0ff57c97707d4f6b5068e8044d2dcc13c.tar.gz
coreclr-8f23fca0ff57c97707d4f6b5068e8044d2dcc13c.tar.bz2
coreclr-8f23fca0ff57c97707d4f6b5068e8044d2dcc13c.zip
Update to buildtools version 1.0.27-prerelease-01407-02, and enable creating transport packages (#10020)
* Update BuildTools fixes * Update to buildtools version 1.0.27-prerelease-01407-02, and enable building transport packages * fix netcore project * Avoid msb3644 error * Fix bad copy
Diffstat (limited to 'src')
-rw-r--r--src/.nuget/dir.props5
-rw-r--r--src/.nuget/packageIndex.json2
-rw-r--r--src/ToolBox/SOS/NETCore/SOS.NETCore.csproj6
-rw-r--r--src/ToolBox/SOS/NETCore/project.json6
-rw-r--r--src/mscorlib/System.Private.CoreLib.csproj6
-rw-r--r--src/mscorlib/facade/mscorlib.csproj5
-rw-r--r--src/mscorlib/ref/mscorlib.csproj7
7 files changed, 34 insertions, 3 deletions
diff --git a/src/.nuget/dir.props b/src/.nuget/dir.props
index c016b1165f..de85ad675f 100644
--- a/src/.nuget/dir.props
+++ b/src/.nuget/dir.props
@@ -5,7 +5,10 @@
<PropertyGroup>
<!-- defined in buildtools packaging.targets, but we need this before targets are imported -->
<PackagePlatform>AnyCPU</PackagePlatform>
-
+
+ <!-- build the transport package which includes product and symbols in addition to standard packages -->
+ <CreatePackedPackage Condition="'$(CreatePackedPackage)' == ''">true</CreatePackedPackage>
+
<!-- Distro rid is passed as runtimeos-arch-->
<_parseDistroRid>$(__DistroRid)</_parseDistroRid>
<_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(__BuildOS)' == 'OSX'">osx.10.10-x64</_parseDistroRid>
diff --git a/src/.nuget/packageIndex.json b/src/.nuget/packageIndex.json
new file mode 100644
index 0000000000..7a73a41bfd
--- /dev/null
+++ b/src/.nuget/packageIndex.json
@@ -0,0 +1,2 @@
+{
+} \ No newline at end of file
diff --git a/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj b/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj
index bd9d2395f8..12c63d27fe 100644
--- a/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj
+++ b/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj
@@ -12,6 +12,12 @@
<NoStdLib>true</NoStdLib>
<NoCompilerStandardLib>true</NoCompilerStandardLib>
<UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey>
+
+ <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two properties to any folder that exists to skip
+ the GenerateReferenceAssemblyPaths task (not target) and to prevent it from outputting a warning (MSB3644). -->
+ <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)/Documentation</_TargetFrameworkDirectories>
+ <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths>
+
</PropertyGroup>
<!-- Default configurations to help VS understand the options -->
diff --git a/src/ToolBox/SOS/NETCore/project.json b/src/ToolBox/SOS/NETCore/project.json
index 7a3cf4fe1d..6b2061a577 100644
--- a/src/ToolBox/SOS/NETCore/project.json
+++ b/src/ToolBox/SOS/NETCore/project.json
@@ -6,7 +6,11 @@
"System.Reflection.Metadata": "1.4.1"
},
"frameworks": {
- "netcoreapp1.0": {}
+ "netcoreapp1.0": {
+ "imports": [
+ "portable-net45+win8"
+ ]
+ }
},
"runtimes": {
"win7-x86": {},
diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj
index ca8c9c2905..0271052591 100644
--- a/src/mscorlib/System.Private.CoreLib.csproj
+++ b/src/mscorlib/System.Private.CoreLib.csproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Always use latest Roslyn compiler -->
- <Import Project="..\..\Tools\net45\roslyn\build\Microsoft.Net.Compilers.props" Condition="'$(OS)'=='Windows_NT'" />
+ <Import Project="..\..\Tools\net46\roslyn\build\Microsoft.Net.Compilers.props" Condition="'$(OS)'=='Windows_NT'" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<!-- Include common build properties -->
<Import Project="..\..\dir.props" />
@@ -35,6 +35,10 @@
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<DefineConstants>$(DefineConstants);CORECLR;_USE_NLS_PLUS_TABLE;RESOURCE_SATELLITE_CONFIG;CODE_ANALYSIS_BASELINE</DefineConstants>
+ <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two properties to any folder that exists to skip
+ the GenerateReferenceAssemblyPaths task (not target) and to prevent it from outputting a warning (MSB3644). -->
+ <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)/Documentation</_TargetFrameworkDirectories>
+ <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths>
</PropertyGroup>
<!-- Add Serviceable attribute to the project's metadata -->
<ItemGroup>
diff --git a/src/mscorlib/facade/mscorlib.csproj b/src/mscorlib/facade/mscorlib.csproj
index 038a698f23..33df18304b 100644
--- a/src/mscorlib/facade/mscorlib.csproj
+++ b/src/mscorlib/facade/mscorlib.csproj
@@ -31,6 +31,11 @@
<!-- We want to exclude the transitive closure of the packages pulled in via project.json as that introduces ambiguity -->
<OmitTransitiveCompileReferences>true</OmitTransitiveCompileReferences>
<NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
+
+ <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two properties to any folder that exists to skip
+ the GenerateReferenceAssemblyPaths task (not target) and to prevent it from outputting a warning (MSB3644). -->
+ <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)/Documentation</_TargetFrameworkDirectories>
+ <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths>
</PropertyGroup>
<!-- Default configurations to help VS understand the options -->
diff --git a/src/mscorlib/ref/mscorlib.csproj b/src/mscorlib/ref/mscorlib.csproj
index 30da2de8f3..335630e37b 100644
--- a/src/mscorlib/ref/mscorlib.csproj
+++ b/src/mscorlib/ref/mscorlib.csproj
@@ -60,6 +60,13 @@
<OutputPath>$(BinDir)\ref</OutputPath>
</PropertyGroup>
+ <PropertyGroup>
+ <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two properties to any folder that exists to skip
+ the GenerateReferenceAssemblyPaths task (not target) and to prevent it from outputting a warning (MSB3644). -->
+ <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)/Documentation</_TargetFrameworkDirectories>
+ <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths>
+ </PropertyGroup>
+
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)\mscorlib.cs" />
<Compile Include="$(MSBuildThisFileDirectory)\mscorlib.manual.cs" />