diff --git a/Makefile b/Makefile index 2664e31f59004..ef5555ed468f2 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ SHELL = /bin/bash OS_NAME = $(shell uname -s) -NUGET_PACKAGE_NAME = nuget.40 +NUGET_PACKAGE_NAME = nuget.41 BUILD_CONFIGURATION = Debug BOOTSTRAP_PATH = $(shell pwd)/Binaries/Bootstrap BUILD_LOG_PATH = XUNIT_VERSION = 2.1.0 -MSBUILD_ADDITIONALARGS := /v:m /fl /fileloggerparameters:Verbosity=normal /p:SignAssembly=false /p:DebugSymbols=false /p:Configuration=$(BUILD_CONFIGURATION) +MSBUILD_ADDITIONALARGS := /v:m /fl /fileloggerparameters:Verbosity=normal /p:DebugSymbols=false /p:Configuration=$(BUILD_CONFIGURATION) ifeq ($(OS_NAME),Linux) MSBUILD_ADDITIONALARGS := $(MSBUILD_ADDITIONALARGS) /p:BaseNuGetRuntimeIdentifier=ubuntu.14.04 diff --git a/build/Targets/Settings.targets b/build/Targets/Settings.targets index b75fab1e86322..4d2981ef9c9e1 100644 --- a/build/Targets/Settings.targets +++ b/build/Targets/Settings.targets @@ -24,7 +24,7 @@ Microsoft.Net.Compilers - $(NuGetPackageRoot)\Microsoft.Net.Compilers\1.2.0-beta-20151211-01\build\Microsoft.Net.Compilers.props + $(NuGetPackageRoot)\Microsoft.Net.Compilers\1.2.0-beta1-20151231-01\build\Microsoft.Net.Compilers.props $(NuGetPackageRoot)\Microsoft.Net.RoslynDiagnostics\1.1.1-beta1-20150818-01\build\Microsoft.Net.RoslynDiagnostics.props $(AdditionalFileItemNames);PublicAPI @@ -48,6 +48,16 @@ + + + $(MSBuildThisFileDirectory)..\scripts\extra_unix_args.rsp + + 14.0 @@ -131,13 +141,22 @@ Condition="Exists('$(RoslynDiagnosticsPropsFilePath)') And ('$(UseRoslynAnalyzers)' == 'true')" /> + + + + - $(BootstrapBuildPath) - csc.cmd - $(BootstrapBuildPath) - vbc.cmd + true + $(BootstrapBuildPath)\Microsoft.CSharp.Core.targets + $(BootstrapBuildPath)\Microsoft.VisualBasic.Core.targets + false diff --git a/build/Targets/VSL.Imports.targets b/build/Targets/VSL.Imports.targets index fa8626e92f1a6..e8a887b8d9362 100644 --- a/build/Targets/VSL.Imports.targets +++ b/build/Targets/VSL.Imports.targets @@ -16,15 +16,33 @@ + + true + true + + + + + + + true + + + + + true + + + + $(VSLToolsPath)\Strong Name Keys\35MSSharedLib1024.snk - true 0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9 31BF3856AD364E35 @@ -214,7 +232,7 @@ @@ -251,29 +269,6 @@ - - - - true - true - - - - - - - -