diff options
| -rw-r--r-- | BuildToolsVersion.txt | 2 | ||||
| -rw-r--r-- | src/.nuget/Microsoft.NETCore.Jit/descriptions.json | 5 | ||||
| -rw-r--r-- | src/.nuget/descriptions.json | 5 | ||||
| -rw-r--r-- | src/mscorlib/GenerateCompilerResponseFile.targets | 8 |
4 files changed, 15 insertions, 5 deletions
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index 184804184a..5e3f561211 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -1.0.25-prerelease-00416-04
\ No newline at end of file +1.0.25-prerelease-00416-05 diff --git a/src/.nuget/Microsoft.NETCore.Jit/descriptions.json b/src/.nuget/Microsoft.NETCore.Jit/descriptions.json index 411e67b4d7..167cee1b93 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/descriptions.json +++ b/src/.nuget/Microsoft.NETCore.Jit/descriptions.json @@ -5,6 +5,11 @@ "CommonTypes": [ ] }, { + "Name": "NuGet3MinVersion", + "Description": "When using NuGet 3.x this package requires at least version {0}.", + "CommonTypes": [ ] + }, + { "Name": "Microsoft.NETCore.Jit", "Description": "The .NET JIT compiler.", "CommonTypes": [ ] diff --git a/src/.nuget/descriptions.json b/src/.nuget/descriptions.json index 8a8333f290..81d22ce820 100644 --- a/src/.nuget/descriptions.json +++ b/src/.nuget/descriptions.json @@ -5,6 +5,11 @@ "CommonTypes": [ ] }, { + "Name": "NuGet3MinVersion", + "Description": "When using NuGet 3.x this package requires at least version {0}.", + "CommonTypes": [ ] + }, + { "Name": "Microsoft.NETCore.Runtime.CoreCLR", "Description": "The .NET Core runtime, called CoreCLR, and the base library, called mscorlib. It includes the garbage collector, JIT compiler, base .NET data types and many low-level classes.", "CommonTypes": [ ] diff --git a/src/mscorlib/GenerateCompilerResponseFile.targets b/src/mscorlib/GenerateCompilerResponseFile.targets index 0212fcdee1..ed9136ffc6 100644 --- a/src/mscorlib/GenerateCompilerResponseFile.targets +++ b/src/mscorlib/GenerateCompilerResponseFile.targets @@ -5,18 +5,18 @@ </PropertyGroup> <Target Name="GenerateCompilerResponseFile"> - <Message Text="Generating module name response file: $(IntermediateOutputPath)\moduleName.rsp" /> + <Message Text="Generating module name response file: $(IntermediateOutputPath)\moduleName.$(AssemblyName).rsp" /> <!-- We need to set the runtimemetadataversion --> - <WriteLinesToFile File="$(IntermediateOutputPath)\moduleName.rsp" + <WriteLinesToFile File="$(IntermediateOutputPath)\moduleName.$(AssemblyName).rsp" Lines="/runtimemetadataversion:v4.0.30319" Overwrite="true" /> <ItemGroup> - <Clean Include="$(IntermediateOutputPath)\moduleName.rsp" /> + <Clean Include="$(IntermediateOutputPath)\moduleName.$(AssemblyName).rsp" /> </ItemGroup> <PropertyGroup> - <CompilerResponseFile>$(IntermediateOutputPath)\moduleName.rsp</CompilerResponseFile> + <CompilerResponseFile>$(IntermediateOutputPath)\moduleName.$(AssemblyName).rsp;$(CompilerResponseFile)</CompilerResponseFile> </PropertyGroup> </Target> </Project>
\ No newline at end of file |