Merge pull request #1 from dotnet/rel/1.0.0

updating fork
This commit is contained in:
Rohit Agrawal 2016-04-29 14:58:50 -07:00
commit 3310e5f2f9
297 changed files with 6429 additions and 1474 deletions

View file

@ -103,6 +103,12 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-dependency-tool-invo
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Compiler.Common.Tests", "test\Microsoft.DotNet.Compiler.Common.Tests\Microsoft.DotNet.Compiler.Common.Tests.xproj", "{44E7D1AC-DCF1-4A18-9C22-F09E6BB302B5}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-pack.Tests", "test\dotnet-pack.Tests\dotnet-pack.Tests.xproj", "{5FDA6D37-3A3E-4333-BA5C-F0B28BE316F4}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-run.Tests", "test\dotnet-run.Tests\dotnet-run.Tests.xproj", "{35E3C2DC-9B38-4EC5-8DD7-C32458DC485F}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Performance", "test\Performance\Performance.xproj", "{6A3095FF-A7C5-4300-85A9-C025C384401D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -723,6 +729,54 @@ Global
{44E7D1AC-DCF1-4A18-9C22-F09E6BB302B5}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
{44E7D1AC-DCF1-4A18-9C22-F09E6BB302B5}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
{44E7D1AC-DCF1-4A18-9C22-F09E6BB302B5}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
{5FDA6D37-3A3E-4333-BA5C-F0B28BE316F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5FDA6D37-3A3E-4333-BA5C-F0B28BE316F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5FDA6D37-3A3E-4333-BA5C-F0B28BE316F4}.Debug|x64.ActiveCfg = Debug|Any CPU
{5FDA6D37-3A3E-4333-BA5C-F0B28BE316F4}.Debug|x64.Build.0 = Debug|Any CPU
{5FDA6D37-3A3E-4333-BA5C-F0B28BE316F4}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
{5FDA6D37-3A3E-4333-BA5C-F0B28BE316F4}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
{5FDA6D37-3A3E-4333-BA5C-F0B28BE316F4}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
{5FDA6D37-3A3E-4333-BA5C-F0B28BE316F4}.MinSizeRel|x64.Build.0 = Debug|Any CPU
{5FDA6D37-3A3E-4333-BA5C-F0B28BE316F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5FDA6D37-3A3E-4333-BA5C-F0B28BE316F4}.Release|Any CPU.Build.0 = Release|Any CPU
{5FDA6D37-3A3E-4333-BA5C-F0B28BE316F4}.Release|x64.ActiveCfg = Release|Any CPU
{5FDA6D37-3A3E-4333-BA5C-F0B28BE316F4}.Release|x64.Build.0 = Release|Any CPU
{5FDA6D37-3A3E-4333-BA5C-F0B28BE316F4}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
{5FDA6D37-3A3E-4333-BA5C-F0B28BE316F4}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
{5FDA6D37-3A3E-4333-BA5C-F0B28BE316F4}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
{5FDA6D37-3A3E-4333-BA5C-F0B28BE316F4}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
{35E3C2DC-9B38-4EC5-8DD7-C32458DC485F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{35E3C2DC-9B38-4EC5-8DD7-C32458DC485F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{35E3C2DC-9B38-4EC5-8DD7-C32458DC485F}.Debug|x64.ActiveCfg = Debug|Any CPU
{35E3C2DC-9B38-4EC5-8DD7-C32458DC485F}.Debug|x64.Build.0 = Debug|Any CPU
{35E3C2DC-9B38-4EC5-8DD7-C32458DC485F}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
{35E3C2DC-9B38-4EC5-8DD7-C32458DC485F}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
{35E3C2DC-9B38-4EC5-8DD7-C32458DC485F}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
{35E3C2DC-9B38-4EC5-8DD7-C32458DC485F}.MinSizeRel|x64.Build.0 = Debug|Any CPU
{35E3C2DC-9B38-4EC5-8DD7-C32458DC485F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{35E3C2DC-9B38-4EC5-8DD7-C32458DC485F}.Release|Any CPU.Build.0 = Release|Any CPU
{35E3C2DC-9B38-4EC5-8DD7-C32458DC485F}.Release|x64.ActiveCfg = Release|Any CPU
{35E3C2DC-9B38-4EC5-8DD7-C32458DC485F}.Release|x64.Build.0 = Release|Any CPU
{35E3C2DC-9B38-4EC5-8DD7-C32458DC485F}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
{35E3C2DC-9B38-4EC5-8DD7-C32458DC485F}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
{35E3C2DC-9B38-4EC5-8DD7-C32458DC485F}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
{35E3C2DC-9B38-4EC5-8DD7-C32458DC485F}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
{6A3095FF-A7C5-4300-85A9-C025C384401D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6A3095FF-A7C5-4300-85A9-C025C384401D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6A3095FF-A7C5-4300-85A9-C025C384401D}.Debug|x64.ActiveCfg = Debug|Any CPU
{6A3095FF-A7C5-4300-85A9-C025C384401D}.Debug|x64.Build.0 = Debug|Any CPU
{6A3095FF-A7C5-4300-85A9-C025C384401D}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
{6A3095FF-A7C5-4300-85A9-C025C384401D}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
{6A3095FF-A7C5-4300-85A9-C025C384401D}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
{6A3095FF-A7C5-4300-85A9-C025C384401D}.MinSizeRel|x64.Build.0 = Debug|Any CPU
{6A3095FF-A7C5-4300-85A9-C025C384401D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6A3095FF-A7C5-4300-85A9-C025C384401D}.Release|Any CPU.Build.0 = Release|Any CPU
{6A3095FF-A7C5-4300-85A9-C025C384401D}.Release|x64.ActiveCfg = Release|Any CPU
{6A3095FF-A7C5-4300-85A9-C025C384401D}.Release|x64.Build.0 = Release|Any CPU
{6A3095FF-A7C5-4300-85A9-C025C384401D}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
{6A3095FF-A7C5-4300-85A9-C025C384401D}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
{6A3095FF-A7C5-4300-85A9-C025C384401D}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
{6A3095FF-A7C5-4300-85A9-C025C384401D}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -771,5 +825,8 @@ Global
{1AB5B24B-B317-4142-A5D1-A6E84F15BA34} = {ADA7052B-884B-4776-8B8D-D04191D0AA70}
{C26A48BB-193F-450C-AB09-4D3324C78188} = {1AB5B24B-B317-4142-A5D1-A6E84F15BA34}
{44E7D1AC-DCF1-4A18-9C22-F09E6BB302B5} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
{5FDA6D37-3A3E-4333-BA5C-F0B28BE316F4} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
{35E3C2DC-9B38-4EC5-8DD7-C32458DC485F} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
{6A3095FF-A7C5-4300-85A9-C025C384401D} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
EndGlobalSection
EndGlobal

View file

@ -84,7 +84,7 @@ Compiling to IL is done using:
This will drop a binary in `./bin/[configuration]/[framework]/[rid]/[binary name]` that you can just run.
For more details, please refer to the [documentation](https://github.com/dotnet/corert/tree/master/Documentation).
For more details, please refer to the [documentation](Documentation).
Building from source
--------------------

View file

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="3.5.0.0" newVersion="8.0.0.0" />
<bindingRedirect oldVersion="4.5.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Some.Foo.Assembly" publicKeyToken="814f48568d36eed5" culture="neutral" />
<bindingRedirect oldVersion="3.0.0.0" newVersion="5.5.5.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<appSettings>
<add key="Setting1" value="Hello"/>
<add key="Setting2" value="World"/>
</appSettings>
</configuration>

View file

@ -0,0 +1,27 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"compile": [
"../src/*.cs"
],
"dependencies": {
"Newtonsoft.Json": "8.0.3",
"Microsoft.AspNet.Mvc": "3.0.50813.1",
"Unity.Mvc": "3.0.1304",
"dotnet-desktop-binding-redirects": "1.0.0-*"
},
"frameworks": {
"net451": {}
},
"tools": {
"dotnet-dependency-tool-invoker": {
"version": "1.0.0-*",
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
}
}

View file

@ -0,0 +1,27 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"compile": [
"../src/*.cs"
],
"dependencies": {
"Newtonsoft.Json": "8.0.3",
"Microsoft.AspNet.Mvc": "3.0.50813.1",
"Unity.Mvc": "3.0.1304",
"dotnet-desktop-binding-redirects": "1.0.0-*"
},
"frameworks": {
"net451": {}
},
"tools": {
"dotnet-dependency-tool-invoker": {
"version": "1.0.0-*",
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
}
}

View file

@ -0,0 +1,49 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
namespace BindingRedirects
{
public class Program
{
private const string ExpectedNewtonSoftVersion = "8.0.0.0";
public static int Main(string[] args)
{
return VerifyJsonLoad();
}
private static int VerifyJsonLoad()
{
WriteLine("=======Verifying Redirected Newtonsoft.Json assembly load=======");
int result = 0;
try
{
var jsonAsm = typeof(Newtonsoft.Json.JsonConvert).Assembly;
var version = jsonAsm.GetName().Version.ToString();
if (version != ExpectedNewtonSoftVersion)
{
WriteLine($"Failure - Newtonsoft.Json: ExpectedVersion - {ExpectedNewtonSoftVersion}, ActualVersion - {version}");
result = -1;
}
}
catch (Exception ex)
{
WriteLine($"Failed to load type 'Newtonsoft.Json.JsonConvert'");
throw ex;
}
return result;
}
private static void WriteLine(string str)
{
var currentAssembly = Assembly.GetExecutingAssembly().GetName().Name;
Console.WriteLine($"{currentAssembly}: {str}");
}
}
}

View file

@ -2,7 +2,7 @@
"version": "1.0.0-*",
"dependencies": {
"PackageWithFakeNativeDep": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24022"
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24027"
},
"compilationOptions": {
"emitEntryPoint": true

View file

@ -0,0 +1,11 @@
using System;
namespace DesktopAppWithRuntimes
{
public static class Program
{
public static void Main(string[] args)
{
}
}
}

View file

@ -0,0 +1,16 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc2-*"
},
"compilationOptions": {
"emitEntryPoint": true
},
"frameworks": {
"net451": {}
},
"runtimes":
{
"win7-x64": {}
}
}

View file

@ -4,7 +4,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113",
"Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254",
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24022"
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24027"
},
"compilationOptions": {
"emitEntryPoint": true

View file

@ -4,7 +4,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113",
"Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254",
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24022"
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24027"
},
"compilationOptions": {
"platform": "anycpu32bitpreferred",

View file

@ -4,7 +4,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113",
"Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254",
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24022"
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24027"
},
"compilationOptions": {
"emitEntryPoint": true

View file

@ -0,0 +1,12 @@
using System;
namespace ConsoleApplication
{
public class Program
{
public static void Main(string[] args)
{
Console.WriteLine("Hello World!");
}
}
}

View file

@ -0,0 +1,18 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
"ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": { "target": "project" }
},
"frameworks": {
"netcoreapp1.0": {
"imports": "dnxcore50"
}
}
}

View file

@ -5,7 +5,7 @@
"netstandard1.3": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24022"
"NETStandard.Library": "1.5.0-rc2-24027"
}
}
}

View file

@ -0,0 +1,49 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
namespace BindingRedirects
{
public class Program
{
private const string ExpectedNewtonSoftVersion = "8.0.0.0";
public static int Main(string[] args)
{
return VerifyJsonLoad();
}
private static int VerifyJsonLoad()
{
WriteLine("=======Verifying Redirected Newtonsoft.Json assembly load=======");
int result = 0;
try
{
var jsonAsm = typeof(Newtonsoft.Json.JsonConvert).Assembly;
var version = jsonAsm.GetName().Version.ToString();
if (version != ExpectedNewtonSoftVersion)
{
WriteLine($"Failure - Newtonsoft.Json: ExpectedVersion - {ExpectedNewtonSoftVersion}, ActualVersion - {version}");
result = -1;
}
}
catch (Exception ex)
{
WriteLine($"Failed to load type 'Newtonsoft.Json.JsonConvert'");
throw ex;
}
return result;
}
private static void WriteLine(string str)
{
var currentAssembly = Assembly.GetExecutingAssembly().GetName().Name;
Console.WriteLine($"{currentAssembly}: {str}");
}
}
}

View file

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>281f1cdb-8627-47c7-9bb1-cde8d30d93d1</ProjectGuid>
<RootNamespace>dotnet-desktop-binding-redirects</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

View file

@ -0,0 +1,18 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"Newtonsoft.Json": "5.0.0",
"NuGet.Protocol.Core.v3": "3.3.0"
},
"frameworks": {
"net451": {
"frameworkAssemblies": {
"System.Configuration": ""
}
}
}
}

View file

@ -0,0 +1,13 @@
using System;
namespace ConsoleApplication
{
public class Program
{
public static int Main(string[] args)
{
Console.WriteLine("Hello World!");
return 100;
}
}
}

View file

@ -0,0 +1,31 @@
{
"version": "1.0.0-*",
"buildOptions": {
"emitEntryPoint": true,
"embed": {
"include": "*.resx",
"mappings": {
"myresource.resx": "resource2.resx"
}
},
"copyToOutput": {
"include": "copy/*.txt",
"excludeFiles": "copy/fileex.txt"
}
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"packOptions": {
"files": {
"includeFiles": "packfiles/pack1.txt",
"mappings": {
"newpath/": "packfiles/pack2.txt"
}
}
},
"publishOptions": "testpublishfile.txt",
"frameworks": {
"netcoreapp1.0": { }
}
}

View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
Some content
</root>

View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
Some content
</root>

View file

@ -2,7 +2,7 @@
"version": "1.0.0-*",
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"NETStandard.Library": "1.5.0-rc2-24022"
"NETStandard.Library": "1.5.0-rc2-24027"
},
"compilerName": "fsc",
"compileFiles": [

View file

@ -3,7 +3,7 @@
"outputName": "MyLibrary"
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24022"
"NETStandard.Library": "1.5.0-rc2-24027"
},
"frameworks": {
"netstandard1.5": {}

View file

@ -0,0 +1,11 @@
using System;
namespace ConsoleApplication
{
public class Program
{
public static void Main()
{
}
}
}

View file

@ -0,0 +1,15 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
},
"frameworks": {
"netcoreapp1.0": { }
}
}

View file

@ -0,0 +1,12 @@
using System;
namespace ConsoleApplication
{
public class Program
{
public static void Main()
{
ConsoleLibrary.P1.Program.Main();
}
}
}

View file

@ -0,0 +1,18 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"SingleTargetP1" : {
"target": "project"
},
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
},
"frameworks": {
"netcoreapp1.0": { }
}
}

View file

@ -0,0 +1,12 @@
using System;
namespace ConsoleLibrary.P1
{
public class Program
{
public static void Main()
{
ConsoleLibrary.P2.Program.Main();
}
}
}

View file

@ -0,0 +1,15 @@
{
"version": "1.0.0-*",
"dependencies": {
"SingleTargetP2" : {
"target": "project"
},
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
},
"frameworks": {
"netcoreapp1.0": { }
}
}

View file

@ -0,0 +1,11 @@
using System;
namespace ConsoleLibrary.P2
{
public class Program
{
public static void Main()
{
}
}
}

View file

@ -0,0 +1,12 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
},
"frameworks": {
"netcoreapp1.0": { }
}
}

View file

@ -0,0 +1,11 @@
using System;
namespace ConsoleApplication
{
public class Program
{
public static void Main()
{
}
}
}

View file

@ -0,0 +1,16 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
},
"frameworks": {
"netcoreapp1.0": { },
"netstandard1.5": { }
}
}

View file

@ -0,0 +1,12 @@
using System;
namespace ConsoleApplication
{
public class Program
{
public static void Main()
{
ConsoleLibrary.P1.Program.Main();
}
}
}

View file

@ -0,0 +1,19 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"TwoTargetP1" : {
"target": "project"
},
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
},
"frameworks": {
"netcoreapp1.0": { },
"netstandard1.5": { }
}
}

View file

@ -0,0 +1,12 @@
using System;
namespace ConsoleLibrary.P1
{
public class Program
{
public static void Main()
{
ConsoleLibrary.P2.Program.Main();
}
}
}

View file

@ -0,0 +1,16 @@
{
"version": "1.0.0-*",
"dependencies": {
"TwoTargetP2" : {
"target": "project"
},
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
},
"frameworks": {
"netcoreapp1.0": { },
"netstandard1.5": { }
}
}

View file

@ -0,0 +1,11 @@
using System;
namespace ConsoleLibrary.P2
{
public class Program
{
public static void Main()
{
}
}
}

View file

@ -0,0 +1,13 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
},
"frameworks": {
"netcoreapp1.0": { },
"netstandard1.5": { }
}
}

View file

@ -0,0 +1,12 @@
using System;
namespace ConsoleApplication
{
public class Program
{
public static void Main()
{
ConsoleLibrary.P1.Program.Main();
}
}
}

View file

@ -0,0 +1,19 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"TwoTargetLargeP1" : {
"target": "project"
},
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
},
"frameworks": {
"netcoreapp1.0": { },
"netstandard1.5": { }
}
}

View file

@ -0,0 +1,13 @@
using System;
namespace ConsoleLibrary.P1
{
public class Program
{
public static void Main()
{
ConsoleLibrary.P2.Program.Main();
ConsoleLibrary.P4.Program.Main();
}
}
}

View file

@ -0,0 +1,19 @@
{
"version": "1.0.0-*",
"dependencies": {
"TwoTargetLargeP2" : {
"target": "project"
},
"TwoTargetLargeP4" : {
"target": "project"
},
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
},
"frameworks": {
"netcoreapp1.0": { },
"netstandard1.5": { }
}
}

View file

@ -0,0 +1,13 @@
using System;
namespace ConsoleLibrary.P2
{
public class Program
{
public static void Main()
{
ConsoleLibrary.P3.Program.Main();
ConsoleLibrary.P4.Program.Main();
}
}
}

View file

@ -0,0 +1,19 @@
{
"version": "1.0.0-*",
"dependencies": {
"TwoTargetLargeP3" : {
"target": "project"
},
"TwoTargetLargeP4" : {
"target": "project"
},
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
},
"frameworks": {
"netcoreapp1.0": { },
"netstandard1.5": { }
}
}

View file

@ -0,0 +1,12 @@
using System;
namespace ConsoleLibrary.P3
{
public class Program
{
public static void Main()
{
ConsoleLibrary.P4.Program.Main();
}
}
}

View file

@ -0,0 +1,16 @@
{
"version": "1.0.0-*",
"dependencies": {
"TwoTargetLargeP4" : {
"target": "project"
},
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
},
"frameworks": {
"netcoreapp1.0": { },
"netstandard1.5": { }
}
}

View file

@ -0,0 +1,13 @@
using System;
namespace ConsoleLibrary.P4
{
public class Program
{
public static void Main()
{
ConsoleLibrary.P5.Program.Main();
ConsoleLibrary.P6.Program.Main();
}
}
}

View file

@ -0,0 +1,19 @@
{
"version": "1.0.0-*",
"dependencies": {
"TwoTargetLargeP5" : {
"target": "project"
},
"TwoTargetLargeP6" : {
"target": "project"
},
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
},
"frameworks": {
"netcoreapp1.0": { },
"netstandard1.5": { }
}
}

View file

@ -0,0 +1,11 @@
using System;
namespace ConsoleLibrary.P5
{
public class Program
{
public static void Main()
{
}
}
}

View file

@ -0,0 +1,13 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
},
"frameworks": {
"netcoreapp1.0": { },
"netstandard1.5": { }
}
}

View file

@ -0,0 +1,11 @@
using System;
namespace ConsoleLibrary.P6
{
public class Program
{
public static void Main()
{
}
}
}

View file

@ -0,0 +1,13 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
},
"frameworks": {
"netcoreapp1.0": { },
"netstandard1.5": { }
}
}

View file

@ -0,0 +1,55 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using Xunit;
namespace FakeTests
{
public class GivenThatIWantSomeFakeTests
{
#if NET451
[Fact]
public void NET451_succeeds()
{
Assert.True(true);
}
[Fact(Skip="Skipped for NET451")]
public void SkippedTest()
{
}
#else
[Fact]
public void NETCOREAPP_succeeds()
{
Assert.True(true);
}
[Fact(Skip="Skipped for NETCOREAPP1.0")]
public void SkippedTest()
{
}
#endif
[Fact]
public void Common_succeeds()
{
Assert.True(true);
}
[Fact]
public void Fails_IfEnvironmentVariableIsSet()
{
var shouldFail = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("DOTNET_TEST_SHOULD_FAIL"));
#if NET451
Assert.True(shouldFail, "Failing in NET451");
#else
Assert.True(shouldFail, "Failing in NETCOREAPP1.0");
#endif
}
}
}

View file

@ -0,0 +1,27 @@
{
"version": "1.0.0-*",
"dependencies": {
"dotnet-test-xunit": "1.0.0-rc2-162081-13",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
"xunit": "2.1.0"
},
"frameworks": {
"netcoreapp1.0": {
"imports": [
"dotnet",
"portable-dnxcore50+net45+win8+wp8+wpa81",
"portable-net45+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
"System.Linq.Expressions": "4.0.11-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027"
}
},
"net451": {}
},
"testRunner": "xunit"
}

View file

@ -12,7 +12,7 @@ namespace FakeTests
{
Assert.True(true);
}
[Fact]
public void It_also_succeeds()
{

View file

@ -5,10 +5,10 @@
"type": "platform",
"version": "1.0.0-rc2-*"
},
"System.Linq.Expressions": "4.0.11-rc2-24022",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24022",
"System.Linq.Expressions": "4.0.11-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-dev-140469-38"
"dotnet-test-xunit": "1.0.0-rc2-162081-13"
},
"frameworks": {
"netcoreapp1.0": {

View file

@ -1,7 +1,7 @@
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24022"
"NETStandard.Library": "1.5.0-rc2-24027"
},
"frameworks": {
"netstandard1.5": {

View file

@ -10,7 +10,7 @@
]
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24022"
"NETStandard.Library": "1.5.0-rc2-24027"
},
"frameworks": {
"netstandard1.5": {}

View file

@ -0,0 +1,12 @@
using System;
namespace ConsoleApplication
{
public class Program
{
public static void Main(string[] args)
{
Console.WriteLine("Hello World!");
}
}
}

View file

@ -0,0 +1,18 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-3002498"
},
"LibraryWithBuildDependency": { "target": "project" }
},
"frameworks": {
"netcoreapp1.0": {
"imports": "dnxcore50"
}
}
}

View file

@ -0,0 +1,12 @@
using System;
namespace ConsoleApplication
{
public class Program
{
public static void Main(string[] args)
{
Console.WriteLine("Hello World!");
}
}
}

View file

@ -0,0 +1,18 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-3002498"
},
"Microsoft.Net.Compilers": {
"type": "build",
"version": "1.1.1"
}
},
"frameworks": {
"netcoreapp1.0": {
"imports": "dnxcore50"
}
}
}

View file

@ -10,7 +10,7 @@
]
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24022"
"NETStandard.Library": "1.5.0-rc2-24027"
},
"frameworks": {
"netstandard1.5": {}

View file

@ -10,7 +10,7 @@
]
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24022"
"NETStandard.Library": "1.5.0-rc2-24027"
},
"frameworks": {
"netcoreapp1.0": {}

View file

@ -8,7 +8,7 @@
"target": "project",
"version": "1.0.0-*"
},
"NETStandard.Library": "1.5.0-rc2-24022"
"NETStandard.Library": "1.5.0-rc2-24027"
},
"frameworks": {
"netcoreapp1.0": {}

View file

@ -5,7 +5,7 @@
"target": "project",
"version": "1.0.0-*"
},
"NETStandard.Library": "1.5.0-rc2-24022"
"NETStandard.Library": "1.5.0-rc2-24027"
},
"frameworks": {
"netcoreapp1.0": {}

View file

@ -0,0 +1,12 @@
using System;
namespace ConsoleApplication
{
public class Program
{
public static void Main(string[] args)
{
Console.WriteLine("Hélló Wórld!");
}
}
}

View file

@ -0,0 +1,22 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netcoreapp1.0": { }
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

View file

@ -8,7 +8,7 @@
"net451": {},
"netstandard1.5": {
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24022"
"NETStandard.Library": "1.5.0-rc2-24027"
},
"imports": "portable-net45+win8"
}

View file

@ -11,7 +11,7 @@
"net451": {},
"netstandard1.5": {
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24022"
"NETStandard.Library": "1.5.0-rc2-24027"
},
"imports": "portable-net45+win8"
}

View file

@ -1,7 +1,7 @@
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24022",
"NETStandard.Library": "1.5.0-rc2-24027",
"System.Runtime.Analyzers": {
"version": "1.1.0",
"type": "build"

View file

@ -10,7 +10,7 @@
]
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24022"
"NETStandard.Library": "1.5.0-rc2-24027"
},
"configurations": {
"Test": {}

View file

@ -28,7 +28,7 @@
"netstandard1.5": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24022"
"NETStandard.Library": "1.5.0-rc2-24027"
}
}
}

View file

@ -0,0 +1,24 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace TestLibrary
{
public static class Helper
{
/// <summary>
/// Gets the message from the helper. This comment is here to help test XML documentation file generation, please do not remove it.
/// </summary>
/// <returns>A message</returns>
public static string GetMessage()
{
return "This string came from the test library!";
}
public static void SayHi()
{
Console.WriteLine("Hello there!");
}
}
}

View file

@ -0,0 +1,12 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"xmlDoc": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
},
"frameworks": {
"netstandard1.5": {}
}
}

View file

@ -10,7 +10,7 @@
},
"net451": {
"dependencies": {
"Microsoft.CSharp": "4.0.1-rc2-24022"
"Microsoft.CSharp": "4.0.1-rc2-24027"
}
}
}

View file

@ -10,12 +10,12 @@
},
"netcore50": {
"dependencies": {
"System.Private.Uri": "4.0.1-rc2-24022"
"System.Private.Uri": "4.0.1-rc2-24027"
}
},
"net99": {
"dependencies": {
"Microsoft.CSharp": "4.0.1-rc2-24022"
"Microsoft.CSharp": "4.0.1-rc2-24027"
}
}
}

View file

@ -0,0 +1,12 @@
using System;
namespace ConsoleApplication
{
public class Program2
{
public static void Foo(string[] args)
{
Console.WriteLine("Hello World!");
}
}
}

View file

@ -5,7 +5,7 @@
"package_name": "dotnet-dev-%SDK_NUGET_VERSION%",
"install_root": "/usr/share/dotnet",
"short_description": ".NET Core CLI",
"short_description": "%CLI_SDK_BRAND_NAME%",
"long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.",
"homepage": "https://dotnet.github.io/core",

View file

@ -1,42 +0,0 @@
{
"maintainer_name":"Microsoft",
"maintainer_email": "dotnetcore@microsoft.com",
"package_name": "dotnet-nightly",
"short_description": "Unstable Developer Build of .NET Core CLI",
"long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.",
"homepage": "https://dotnet.github.io/core",
"release":{
"package_version":"0.0.0.0",
"package_revision":"1",
"urgency" : "low",
"changelog_message" : "Bootstrap loop package"
},
"control": {
"priority":"standard",
"section":"devel",
"architecture":"any"
},
"copyright": "2015 Microsoft",
"license": {
"type": "MIT",
"full_text": "Copyright (c) 2015 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
},
"debian_dependencies":{
"clang-3.5" : {},
"%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {}
},
"package_conflicts" : [
"dotnet"
],
"symlinks": {
"bin/dotnet-compile-native" : "/usr/bin/dotnet-compile-native"
}
}

View file

@ -5,7 +5,7 @@
"package_name": "dotnet-host",
"install_root": "/usr/share/dotnet",
"short_description": ".NET Core Host",
"short_description": "%SHARED_HOST_BRAND_NAME%",
"long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.",
"homepage": "https://dotnet.github.io/core",

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<installer-gui-script minSpecVersion="1">
<title>.NET CLI {CLISdkNugetVersion}</title>
<title>{CLISdkBrandName} {CLISdkNugetVersion}</title>
<license file="eula.rtf" mime-type="application/rtf" />
<background file="dotnetbackground.png" mime-type="image/png"/>
<options customize="never" require-scripts="false" />
@ -18,13 +18,13 @@
<line choice="{SharedHostComponentId}.pkg" />
<line choice="{CLISdkComponentId}.pkg"/>
</choices-outline>
<choice id="{SharedFxComponentId}.pkg" visible="true" title=".NET Core Shared Framework (x64)" description="The .NET Core Shared Framework">
<choice id="{SharedFxComponentId}.pkg" visible="true" title="{SharedFxBrandName} (x64)" description="The .NET Core Shared Framework">
<pkg-ref id="{SharedFxComponentId}.pkg" />
</choice>
<choice id="{SharedHostComponentId}.pkg" visible="true" title=".NET Core Shared Host (x64)" description="The .NET Core Shared Host." >
<choice id="{SharedHostComponentId}.pkg" visible="true" title="{SharedHostBrandName} (x64)" description="The .NET Core Shared Host." >
<pkg-ref id="{SharedHostComponentId}.pkg" />
</choice>
<choice id="{CLISdkComponentId}.pkg" visible="true" title=".NET CLI (x64)" description=".NET CLI">
<choice id="{CLISdkComponentId}.pkg" visible="true" title="{CLISdkBrandName} (x64)" description="The .NET Core SDK">
<pkg-ref id="{CLISdkComponentId}.pkg"/>
</choice>
<pkg-ref id="{SharedFxComponentId}.pkg">{SharedFxComponentId}.pkg</pkg-ref>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<installer-gui-script minSpecVersion="1">
<title>.NET Core Shared Framework ({SharedFrameworkNugetName} {SharedFrameworkNugetVersion})</title>
<title>{SharedFxBrandName} ({SharedFrameworkNugetName} {SharedFrameworkNugetVersion})</title>
<license file="eula.rtf" mime-type="application/rtf" />
<background file="dotnetbackground.png" mime-type="image/png"/>
<options customize="never" require-scripts="false" />
@ -13,10 +13,10 @@
<line choice="{SharedFxComponentId}.pkg" />
<line choice="{SharedHostComponentId}.pkg" />
</choices-outline>
<choice id="{SharedFxComponentId}.pkg" visible="true" title=".NET Core Shared Framework (x64)" description="The .NET Core Shared Framework">
<choice id="{SharedFxComponentId}.pkg" visible="true" title="{SharedFxBrandName} (x64)" description="The .NET Core Shared Framework">
<pkg-ref id="{SharedFxComponentId}.pkg" />
</choice>
<choice id="{SharedHostComponentId}.pkg" visible="true" title=".NET Core Shared Host (x64)" description="The .NET Core Shared Host." >
<choice id="{SharedHostComponentId}.pkg" visible="true" title="{SharedHostBrandName} (x64)" description="The .NET Core Shared Host." >
<pkg-ref id="{SharedHostComponentId}.pkg" />
</choice>
<pkg-ref id="{SharedFxComponentId}.pkg">{SharedFxComponentId}.pkg</pkg-ref>

View file

@ -5,7 +5,7 @@
"package_name": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%",
"install_root": "/usr/share/dotnet",
"short_description": ".NET Core %SHARED_FRAMEWORK_NUGET_NAME% %SHARED_FRAMEWORK_NUGET_VERSION%",
"short_description": "%SHARED_FRAMEWORK_BRAND_NAME% %SHARED_FRAMEWORK_NUGET_NAME% %SHARED_FRAMEWORK_NUGET_VERSION%",
"long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.",
"homepage": "https://dotnet.github.io/core",

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="Caption">[WixBundleName] Setup</String>
<String Id="Title">Microsoft .Net CLI for Windows</String>
<String Id="Title">[BUNDLEMONIKER]</String>
<String Id="Motto">You just need a shell, a text editor and 10 minutes of your time.
Ready? Set? Let's go!</String>

View file

@ -24,6 +24,7 @@
<swid:Tag Regid="microsoft.com" InstallPath="[DOTNETHOME]" />
<Variable Name="DOTNETHOME" Type="string" Value="[ProgramFiles6432Folder]dotnet" bal:Overridable="yes" />
<Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker)" bal:Overridable="no" />
<util:RegistrySearch Id="PreviousInstallFolderSearch" Root="HKLM" Key="SOFTWARE\dotnet\Setup" Value="InstallDir" Variable="PreviousInstallFolder" />
<util:DirectorySearch Path="[PreviousInstallFolder]" Variable="DOTNETHOME" After="PreviousInstallFolderSearch" Condition="PreviousInstallFolder" />

View file

@ -7,6 +7,7 @@ param(
[Parameter(Mandatory=$true)][string]$SharedHostMSIFile,
[Parameter(Mandatory=$true)][string]$DotnetBundleOutput,
[Parameter(Mandatory=$true)][string]$WixRoot,
[Parameter(Mandatory=$true)][string]$ProductMoniker,
[Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
@ -28,6 +29,7 @@ function RunCandleForBundle
.\candle.exe -nologo `
-dDotnetSrc="$inputDir" `
-dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" `
-dProductMoniker="$ProductMoniker" `
-dBuildVersion="$DotnetMSIVersion" `
-dDisplayVersion="$DotnetCLIDisplayVersion" `
-dNugetVersion="$DotnetCLINugetVersion" `

View file

@ -5,6 +5,7 @@ param(
[Parameter(Mandatory=$true)][string]$inputDir,
[Parameter(Mandatory=$true)][string]$DotnetMSIOutput,
[Parameter(Mandatory=$true)][string]$WixRoot,
[Parameter(Mandatory=$true)][string]$ProductMoniker,
[Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
@ -48,6 +49,7 @@ function RunCandle
.\candle.exe -nologo `
-dDotnetSrc="$inputDir" `
-dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" `
-dProductMoniker="$ProductMoniker" `
-dBuildVersion="$DotnetMSIVersion" `
-dDisplayVersion="$DotnetCLIDisplayVersion" `
-dNugetVersion="$DotnetCLINugetVersion" `

View file

@ -7,7 +7,7 @@
<?define Dotnet_DisplayVersion = "$(var.DisplayVersion)" ?>
<?define Dotnet_BuildVersion = "$(var.BuildVersion)" ?>
<?define Manufacturer = "Microsoft Corporation" ?>
<?define ProductName = "Microsoft .NET Core CLI for Windows ($(var.NugetVersion))" ?>
<?define ProductName = "$(var.ProductMoniker) ($(var.NugetVersion) $(sys.BUILDARCH))" ?>
<?define ProductLanguage = "1033" ?>
<?define ProductVersion = "$(var.Dotnet_ProductVersion)" ?>
<?define ProductFamily = "dotnet" ?>

View file

@ -5,6 +5,7 @@ param(
[Parameter(Mandatory=$true)][string]$SharedHostPublishRoot,
[Parameter(Mandatory=$true)][string]$DotnetHostMSIOutput,
[Parameter(Mandatory=$true)][string]$WixRoot,
[Parameter(Mandatory=$true)][string]$ProductMoniker,
[Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
@ -28,6 +29,7 @@ function RunCandle
-ext WixDependencyExtension.dll `
-dHostSrc="$SharedHostPublishRoot" `
-dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" `
-dProductMoniker="$ProductMoniker" `
-dBuildVersion="$DotnetMSIVersion" `
-dDisplayVersion="$DotnetCLIDisplayVersion" `
-dNugetVersion="$DotnetCLINugetVersion" `

Some files were not shown because too many files have changed in this diff Show more