This repository has been archived by the owner on Dec 18, 2017. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 224
Switching to use generations tfms #3037
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 23 additions & 27 deletions
50
src/Microsoft.Dnx.Compilation.CSharp.Abstractions/project.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,26 @@ | ||
{ | ||
"version": "1.0.0-*", | ||
"dependencies": { | ||
"Microsoft.Dnx.Compilation.Abstractions": "1.0.0-*", | ||
"Microsoft.CodeAnalysis.CSharp": "1.1.0-rc1-*" | ||
"version": "1.0.0-*", | ||
"dependencies": { | ||
"Microsoft.Dnx.Compilation.Abstractions": "1.0.0-*", | ||
"Microsoft.CodeAnalysis.CSharp": "1.1.0-rc1-*" | ||
}, | ||
"frameworks": { | ||
"net451": { | ||
"dependencies": {} | ||
}, | ||
|
||
"frameworks": { | ||
"dnx451": { | ||
"dependencies": { | ||
} | ||
}, | ||
"dnxcore50": { | ||
"dependencies": { | ||
"System.Runtime": "4.0.21-beta-*" | ||
} | ||
} | ||
}, | ||
|
||
"scripts": { | ||
"postbuild": [ | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dnx451/*.*\" %project:Directory%/../../artifacts/build/dnx-clr-win-x86/bin", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dnxcore50/*.*\" %project:Directory%/../../artifacts/build/dnx-coreclr-win-x86/bin", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dnx451/*.*\" %project:Directory%/../../artifacts/build/dnx-clr-win-x64/bin", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dnxcore50/*.*\" %project:Directory%/../../artifacts/build/dnx-coreclr-win-x64/bin", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dnx451/*.*\" %project:Directory%/../../artifacts/build/dnx-mono/bin" | ||
] | ||
"dotnet5.4": { | ||
"dependencies": { | ||
"System.Runtime": "4.0.21-beta-*" | ||
} | ||
} | ||
} | ||
|
||
}, | ||
"scripts": { | ||
"postbuild": [ | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/net451/*.*\" %project:Directory%/../../artifacts/build/dnx-clr-win-x86/bin", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dotnet5.4/*.*\" %project:Directory%/../../artifacts/build/dnx-coreclr-win-x86/bin", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/net451/*.*\" %project:Directory%/../../artifacts/build/dnx-clr-win-x64/bin", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dotnet5.4/*.*\" %project:Directory%/../../artifacts/build/dnx-coreclr-win-x64/bin", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/net451/*.*\" %project:Directory%/../../artifacts/build/dnx-mono/bin" | ||
] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -37,7 +37,7 @@ public static CompilationSettings ToCompilationSettings(this ICompilerOptions co | |
} | ||
|
||
AssemblyIdentityComparer assemblyIdentityComparer = | ||
#if DNX451 | ||
#if NET451 | ||
IsDesktop(targetFramework) ? | ||
DesktopAssemblyIdentityComparer.Default : | ||
#endif | ||
|
@@ -99,7 +99,7 @@ private static CSharpCompilationOptions AddSigningOptions(CSharpCompilationOptio | |
|
||
if (!string.IsNullOrEmpty(keyFile)) | ||
{ | ||
#if DNXCORE50 | ||
#if DOTNET5_45_45_4 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Wtf is this 😄 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks like find/replace went a little haywire ;P There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fixed this before pushing. |
||
return options.WithCryptoPublicKey( | ||
SnkUtils.ExtractPublicKey(File.ReadAllBytes(keyFile))); | ||
#else | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,41 +1,42 @@ | ||
{ | ||
"version": "1.0.0-*", | ||
"description": "ASP.NET 5 Roslyn implementation code shared with libraries performing runtime compilation.", | ||
"compilationOptions": { | ||
"define": [ "TRACE" ], | ||
"allowUnsafe": true, | ||
"warningsAsErrors": true | ||
}, | ||
"dependencies": { | ||
"Microsoft.CodeAnalysis.CSharp": "1.1.0-rc1-*", | ||
"Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-*", | ||
"Microsoft.Dnx.Runtime.Sources": { | ||
"version": "1.0.0-*", | ||
"type": "build" | ||
} | ||
}, | ||
"frameworks": { | ||
"dnx451": { | ||
"frameworkAssemblies": { | ||
"System.IO": "4.0.0.0", | ||
"System.Runtime": "" | ||
} | ||
}, | ||
"dnxcore50": { | ||
"dependencies": { | ||
"System.Console": "4.0.0-beta-*", | ||
"System.IO": "4.0.11-*" | ||
} | ||
} | ||
"version": "1.0.0-*", | ||
"description": "ASP.NET 5 Roslyn implementation code shared with libraries performing runtime compilation.", | ||
"compilationOptions": { | ||
"define": [ | ||
"TRACE" | ||
], | ||
"allowUnsafe": true, | ||
"warningsAsErrors": true | ||
}, | ||
"dependencies": { | ||
"Microsoft.CodeAnalysis.CSharp": "1.1.0-rc1-*", | ||
"Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-*", | ||
"Microsoft.Dnx.Runtime.Sources": { | ||
"version": "1.0.0-*", | ||
"type": "build" | ||
} | ||
}, | ||
"frameworks": { | ||
"net451": { | ||
"frameworkAssemblies": { | ||
"System.IO": "4.0.0.0", | ||
"System.Runtime": "" | ||
} | ||
}, | ||
|
||
"scripts": { | ||
"postbuild": [ | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dnx451/*.*\" %project:Directory%/../../artifacts/build/dnx-clr-win-x86/bin", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dnxcore50/*.*\" %project:Directory%/../../artifacts/build/dnx-coreclr-win-x86/bin", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dnx451/*.*\" %project:Directory%/../../artifacts/build/dnx-clr-win-x64/bin", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dnxcore50/*.*\" %project:Directory%/../../artifacts/build/dnx-coreclr-win-x64/bin", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dnx451/*.*\" %project:Directory%/../../artifacts/build/dnx-mono/bin" | ||
] | ||
"dotnet5.4": { | ||
"dependencies": { | ||
"System.Console": "4.0.0-beta-*", | ||
"System.IO": "4.0.11-*" | ||
} | ||
} | ||
} | ||
}, | ||
"scripts": { | ||
"postbuild": [ | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/net451/*.*\" %project:Directory%/../../artifacts/build/dnx-clr-win-x86/bin", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dotnet5.4/*.*\" %project:Directory%/../../artifacts/build/dnx-coreclr-win-x86/bin", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/net451/*.*\" %project:Directory%/../../artifacts/build/dnx-clr-win-x64/bin", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dotnet5.4/*.*\" %project:Directory%/../../artifacts/build/dnx-coreclr-win-x64/bin", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/net451/*.*\" %project:Directory%/../../artifacts/build/dnx-mono/bin" | ||
] | ||
} | ||
} |
50 changes: 26 additions & 24 deletions
50
src/Microsoft.Dnx.DesignTimeHost.Abstractions/project.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,28 @@ | ||
{ | ||
"version": "1.0.0-*", | ||
"description": "ASP.NET 5 interfaces to take advantage of capabilities exposed by the design time host.", | ||
"compilationOptions": { "warningsAsErrors": true }, | ||
"dependencies": { | ||
"Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*", | ||
"Newtonsoft.Json": "6.0.6" | ||
}, | ||
"frameworks": { | ||
"dnx451": { }, | ||
"dnxcore50": { | ||
"dependencies": { | ||
"System.Runtime": "4.0.21-beta-*" | ||
} | ||
} | ||
}, | ||
"scripts": { | ||
"postbuild": [ | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dnx451/*.*\" %project:Directory%/../../artifacts/build/dnx-clr-win-x86/bin/lib/Microsoft.Dnx.DesignTimeHost", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dnxcore50/*.*\" %project:Directory%/../../artifacts/build/dnx-coreclr-win-x86/bin/lib/Microsoft.Dnx.DesignTimeHost", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dnx451/*.*\" %project:Directory%/../../artifacts/build/dnx-clr-win-x64/bin/lib/Microsoft.Dnx.DesignTimeHost", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dnxcore50/*.*\" %project:Directory%/../../artifacts/build/dnx-coreclr-win-x64/bin/lib/Microsoft.Dnx.DesignTimeHost", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dnx451/*.*\" %project:Directory%/../../artifacts/build/dnx-mono/bin/lib/Microsoft.Dnx.DesignTimeHost" | ||
] | ||
"version": "1.0.0-*", | ||
"description": "ASP.NET 5 interfaces to take advantage of capabilities exposed by the design time host.", | ||
"compilationOptions": { | ||
"warningsAsErrors": true | ||
}, | ||
"dependencies": { | ||
"Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*", | ||
"Newtonsoft.Json": "6.0.6" | ||
}, | ||
"frameworks": { | ||
"net451": {}, | ||
"dotnet5.4": { | ||
"dependencies": { | ||
"System.Runtime": "4.0.21-beta-*" | ||
} | ||
} | ||
} | ||
}, | ||
"scripts": { | ||
"postbuild": [ | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/net451/*.*\" %project:Directory%/../../artifacts/build/dnx-clr-win-x86/bin/lib/Microsoft.Dnx.DesignTimeHost", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dotnet5.4/*.*\" %project:Directory%/../../artifacts/build/dnx-coreclr-win-x86/bin/lib/Microsoft.Dnx.DesignTimeHost", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/net451/*.*\" %project:Directory%/../../artifacts/build/dnx-clr-win-x64/bin/lib/Microsoft.Dnx.DesignTimeHost", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/dotnet5.4/*.*\" %project:Directory%/../../artifacts/build/dnx-coreclr-win-x64/bin/lib/Microsoft.Dnx.DesignTimeHost", | ||
"%project:Directory%/../../build/batchcopy \"%project:BuildOutputDir%/Debug/net451/*.*\" %project:Directory%/../../artifacts/build/dnx-mono/bin/lib/Microsoft.Dnx.DesignTimeHost" | ||
] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 14 additions & 11 deletions
25
src/Microsoft.Dnx.Runtime.CommandParsing.Sources/project.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,16 @@ | ||
{ | ||
"version": "1.0.0-*", | ||
"compilationOptions" : { "define" : ["TRACE"], "warningsAsErrors": true }, | ||
"shared": "**/*.cs", | ||
"frameworks" : { | ||
"dnx451" : { }, | ||
"dnxcore50" : { | ||
"dependencies": { | ||
"System.Runtime": "4.0.21-beta-*" | ||
} | ||
} | ||
"version": "1.0.0-*", | ||
"compilationOptions": { | ||
"define": [ "TRACE" ], | ||
"warningsAsErrors": true | ||
}, | ||
"shared": "**/*.cs", | ||
"frameworks": { | ||
"net451": {}, | ||
"dotnet5.4": { | ||
"dependencies": { | ||
"System.Runtime": "4.0.21-beta-*" | ||
} | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For the newly changed Abstractions projects
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😄