Skip to content
This repository has been archived by the owner on Dec 18, 2017. It is now read-only.

Switching to use generations tfms #3037

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion makefile.shade
Original file line number Diff line number Diff line change
Expand Up @@ -1258,7 +1258,14 @@ functions @{
{
continue;
}
projectAssemblies.Add(Path.Combine(Directory.GetCurrentDirectory(), "artifacts", "build", name, target.Framework, name + ".dll"));
var path = Path.Combine(Directory.GetCurrentDirectory(), "artifacts", "build", name, target.Framework, name + ".dll");
if (!File.Exists(path))
{
var directoryName = target.Framework == "dnx451" ? "net451" : "dotnet5.4";
Copy link
Contributor Author

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

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😄

path = Path.Combine(Directory.GetCurrentDirectory(), "artifacts", "build", name, directoryName, name + ".dll");
}

projectAssemblies.Add(path);
}

if (package.Contains(".Sources") || package.Contains("Microsoft.Dnx.Runtime.Internals"))
Expand Down
20 changes: 11 additions & 9 deletions src/Microsoft.Dnx.Compilation.Abstractions/project.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"version": "1.0.0-*",
"description": "Abstractions for compilers used by the runtime.",
"compilationOptions": { "warningsAsErrors": true },
"compilationOptions": {
"warningsAsErrors": true
},
"dependencies": {
"Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*",
"Microsoft.Extensions.HashCodeCombiner.Sources": {
Expand All @@ -10,20 +12,20 @@
}
},
"frameworks": {
"dnx451": { },
"dnxcore50": {
"net451": {},
"dotnet5.4": {
"dependencies": {
"System.IO.FileSystem": "4.0.1-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"
"%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: 23 additions & 27 deletions src/Microsoft.Dnx.Compilation.CSharp.Abstractions/project.json
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"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static CompilationSettings ToCompilationSettings(this ICompilerOptions co
}

AssemblyIdentityComparer assemblyIdentityComparer =
#if DNX451
#if NET451
IsDesktop(targetFramework) ?
DesktopAssemblyIdentityComparer.Default :
#endif
Expand Down Expand Up @@ -99,7 +99,7 @@ private static CSharpCompilationOptions AddSigningOptions(CSharpCompilationOptio

if (!string.IsNullOrEmpty(keyFile))
{
#if DNXCORE50
#if DOTNET5_45_45_4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wtf is this 😄

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like find/replace went a little haywire ;P

Copy link
Contributor Author

Choose a reason for hiding this comment

The 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
Expand Down
77 changes: 39 additions & 38 deletions src/Microsoft.Dnx.Compilation.CSharp.Common/project.json
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 src/Microsoft.Dnx.DesignTimeHost.Abstractions/project.json
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"
]
}
}
23 changes: 12 additions & 11 deletions src/Microsoft.Dnx.Runtime.Abstractions/project.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"version": "1.0.0-*",
"description": "ASP.NET 5 interfaces to take advantage of capabilities exposed by the runtime.",
"compilationOptions": { "warningsAsErrors": true },
"dependencies": { },
"compilationOptions": {
"warningsAsErrors": true
},
"dependencies": {},
"frameworks": {
"dnx451": {
},
"dnxcore50": {
"net451": {},
"dotnet5.4": {
"dependencies": {
"System.Collections": "4.0.11-beta-*",
"System.ComponentModel": "4.0.1-beta-*",
Expand All @@ -21,11 +22,11 @@
},
"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"
"%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"
]
}
}
}
25 changes: 14 additions & 11 deletions src/Microsoft.Dnx.Runtime.CommandParsing.Sources/project.json
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-*"
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ namespace Microsoft.Dnx.Runtime.Sources.Impl
internal class ApplicationGlobalData
{
private readonly IApplicationEnvironment _hostEnvironment;
#if DNXCORE50
#if DNXCORE50 || DOTNET5_4
private readonly object _lock;
private readonly Dictionary<string, object> _appGlobalData;
#endif

public ApplicationGlobalData(IApplicationEnvironment hostEnvironment)
{
_hostEnvironment = hostEnvironment;
#if DNXCORE50
#if DNXCORE50 || DOTNET5_4
// If there is no host environment that we are delegating to, we need a place to store this data in CoreCLR
if (hostEnvironment == null)
{
Expand Down Expand Up @@ -50,7 +50,7 @@ public void SetData(string name, object value)
}
}

#if DNX451
#if DNX451 || NET451
private object GetDataCore(string name)
{
return AppDomain.CurrentDomain.GetData(name);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private static bool TryGetEntryPoint(Assembly assembly, IServiceProvider service

instance = null;
entryPoint = null;
#if DNX451
#if DNX451 || NET451
if (assembly.EntryPoint != null)
{
// Add support for console apps
Expand Down
Loading