Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update mono to 5.10.1.20 #1137

Merged
merged 5 commits into from
Apr 5, 2018
Merged

Update mono to 5.10.1.20 #1137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e43cb9e
Update embedded mono to 5.10.1.20
DustinCampbell Apr 3, 2018
9b4e137
Remove Newtonsoft.Json binding redirect for tests to avoid build warning
DustinCampbell Apr 3, 2018
f4135ff
Disable test parallelization for OmniSharp.Cake.Tests
DustinCampbell Apr 4, 2018
c061826
Update build script to not unnecessarily set MONO_PATH
DustinCampbell Apr 4, 2018
9d99230
Update MSBuildSDKResolver package
DustinCampbell Apr 4, 2018
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
24 changes: 7 additions & 17 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ Task("InstallMonoAssets")
DirectoryHelper.ForceCreate(frameworkFolder);
DirectoryHelper.Copy(env.Folders.MonoFramework, frameworkFolder);

Run("chmod", $"+x '{CombinePaths(env.Folders.Mono, monoRuntimeFile)}'");
Run("chmod", $"+x '{CombinePaths(env.Folders.Mono, "bin", monoRuntimeFile)}'");
Run("chmod", $"+x '{CombinePaths(env.Folders.Mono, "run")}'");
});

Expand Down Expand Up @@ -310,7 +310,7 @@ Task("CreateMSBuildFolder")
FileHelper.Copy(librarySourcePath, libraryTargetPath);
}

sdkResolverTFM = "netstandard1.5";
sdkResolverTFM = "netstandard2.0";
}

// Copy MSBuild SDK Resolver and DotNetHostResolver
Expand Down Expand Up @@ -636,20 +636,10 @@ Task("Test")

var runScript = CombinePaths(env.Folders.Mono, "run");

var oldMonoPath = Environment.GetEnvironmentVariable("MONO_PATH");
try
{
Environment.SetEnvironmentVariable("MONO_PATH", $"{instanceFolder}");

// By default, the run script launches OmniSharp. To launch our Mono runtime
// with xUnit rather than OmniSharp, we pass '--no-omnisharp'
Run(runScript, $"--no-omnisharp \"{xunitInstancePath}\" {arguments}", instanceFolder)
.ExceptionOnError($"Test {testProject} failed for net46");
}
finally
{
Environment.SetEnvironmentVariable("MONO_PATH", oldMonoPath);
}
// By default, the run script launches OmniSharp. To launch our Mono runtime
// with xUnit rather than OmniSharp, we pass '--no-omnisharp'
Run(runScript, $"--no-omnisharp \"{xunitInstancePath}\" {arguments}", instanceFolder)
.ExceptionOnError($"Test {testProject} failed for net46");
}
}
}
Expand Down Expand Up @@ -704,7 +694,7 @@ string PublishMonoBuildForPlatform(string project, MonoRuntime monoRuntime, Buil

DirectoryHelper.Copy(monoRuntime.InstallFolder, outputFolder);

Run("chmod", $"+x '{CombinePaths(outputFolder, monoRuntime.RuntimeFile)}'");
Run("chmod", $"+x '{CombinePaths(outputFolder, "bin", monoRuntime.RuntimeFile)}'");
Run("chmod", $"+x '{CombinePaths(outputFolder, "run")}'");

DirectoryHelper.Copy(env.Folders.MonoFramework, CombinePaths(outputFolder, "framework"));
Expand Down
8 changes: 4 additions & 4 deletions build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"LegacyDotNetVersion": "1.0.0-preview2-1-003177",
"RequiredMonoVersion": "5.2.0.196",
"DownloadURL": "https://omnisharpdownload.blob.core.windows.net/ext",
"MonoRuntimeMacOS": "mono.osx-5.2.0.215.zip",
"MonoRuntimeLinux32": "mono.linux-x86-5.2.0.215.zip",
"MonoRuntimeLinux64": "mono.linux-x86_64-5.2.0.215.zip",
"MonoFramework": "framework-5.2.0.215.zip",
"MonoRuntimeMacOS": "mono.osx-5.10.1.20.zip",
"MonoRuntimeLinux32": "mono.linux-x86-5.10.1.20.zip",
"MonoRuntimeLinux64": "mono.linux-x86_64-5.10.1.20.zip",
"MonoFramework": "framework-5.10.1.20.zip",
"MonoMSBuildRuntime": "Microsoft.Build.Runtime.Mono-alpha6.zip",
"MonoMSBuildLib": "Microsoft.Build.Lib.Mono-alpha6.zip",
"HostProjects": [
Expand Down
1 change: 1 addition & 0 deletions tests/OmniSharp.Cake.Tests/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[assembly: Xunit.CollectionBehavior(DisableTestParallelization = true)]
5 changes: 0 additions & 5 deletions tests/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@
<bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.0.0"/>
</dependentAssembly>

<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
</dependentAssembly>

<dependentAssembly>
<assemblyIdentity name="System.Composition.AttributedModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0"/>
Expand Down
10 changes: 5 additions & 5 deletions tools/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<package id="Microsoft.Build.Tasks.Core" version="15.3.409" />
<package id="Microsoft.Build.Utilities.Core" version="15.3.409" />
<package id="Microsoft.Net.Compilers" version="2.3.2" />
<package id="Microsoft.DotNet.MSBuildSdkResolver" version="15.5.0-preview-007006" />
<package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="2.0.0" />
<package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="2.0.0" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="2.0.0" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="2.0.0" />
<package id="Microsoft.DotNet.MSBuildSdkResolver" version="2.1.300-preview2-008523" />
<package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="2.1.0-preview3-26404-02" />
<package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="2.1.0-preview3-26404-02" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="2.1.0-preview3-26404-02" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="2.1.0-preview3-26404-02" />
<package id="xunit.runner.console" version="2.3.0-rc1-build3809" />
</packages>