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.

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

Add linux-bionic-arm64 build #2653

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "Build"
env:
DotNetVersion: "9.0.101"
DotNetVersion2: "8.0.303"
DotNetVersion: "9.0.102"
DotNetVersion2: "8.0.405"
DotNetVersion3: "7.0.410"
DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
NuGetVersion: "6.5.0"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests-net6.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "Tests net6.0"
env:
DotNetVersion: "9.0.101"
DotNetVersion2: "8.0.303"
DotNetVersion: "9.0.102"
DotNetVersion2: "8.0.405"
DotNetVersion3: "7.0.410"
DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
NuGetVersion: "6.5.0"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "Tests"
env:
DotNetVersion: "9.0.101"
DotNetVersion2: "8.0.303"
DotNetVersion: "9.0.102"
DotNetVersion2: "8.0.405"
DotNetVersion3: "7.0.410"
DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
NuGetVersion: "6.5.0"
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/init.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
# Configuration: Release
Verbosity: Normal
DotNetVersion: "8.0.303"
DotNetVersion: "8.0.405"
CakeVersion: "1.1.0"
NuGetVersion: "5.7.0"
MonoVersion: ""
Expand Down
36 changes: 18 additions & 18 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,21 @@ All build related activites should be encapsulated in this file for cross-platfo

Note: The arguments below should prefixed with a single hyphen on Windows (PowerShell-style) and a double-hyphen on OSX/Linux.

`-target TargetName`: The name of the build task/target to execute (see below for listing and details).
Defaults to `Default`.
`-target TargetName`: The name of the build task/target to execute (see below for listing and details).
Defaults to `Default`.

`-configuration (Release|Debug)`: The configuration to build.
Defaults to `Debug`.
`-configuration (Release|Debug)`: The configuration to build.
Defaults to `Debug`.

`-test-configuration (Release|Debug)`: The configuration to use for the unit tests.
Defaults to `Debug`.
`-test-configuration (Release|Debug)`: The configuration to use for the unit tests.
Defaults to `Debug`.

`-install-path Path`: Path used for the **Install** target.
Defaults to `(%USERPROFILE%|$HOME)/.omnisharp`
`-install-path Path`: Path used for the **Install** target.
Defaults to `(%USERPROFILE%|$HOME)/.omnisharp`

`-publish-all`: Publishes all platforms for the current OS. On Windows, specifying this argument would produce win7-x86, win7-x64, and win10-arm64 builds. On OSX/Linux, this argument causes osx, linux-x86, linux-x64, linux-musl-x64, linux-musl-arm64 and linux-arm64 builds to be published.
`-publish-all`: Publishes all platforms for the current OS. On Windows, specifying this argument would produce win7-x86, win7-x64, and win10-arm64 builds. On OSX/Linux, this argument causes osx, linux-arm64, linux-x64, linux-musl-x64, linux-musl-arm64 and linux-bionic-arm64 builds to be published.

`-archive`: Enable the generation of publishable archives after a build.
`-archive`: Enable the generation of publishable archives after a build.

Note: On macOS/Linux, be sure to pass the arguments above with a double hyphen! (e.g. `--target TargetName`).

Expand All @@ -65,18 +65,18 @@ Note: On macOS/Linux, be sure to pass the arguments above with a double hyphen!
A number of build-related options, including folder names for different entities. Interesting options:

**DotNetInstallScriptURL**: The URL where the .NET SDK install script is located.
Can be used to pin to a specific script version, if a breaking change occurs.
Can be used to pin to a specific script version, if a breaking change occurs.

**DotNetChannel**: The .NET Core SDK channel used for retreiving the tools.

**DotNetVersion**: The .NET Core SDK version used for the build. Can be used to pin to a specific version.
Using the string `Latest` will retrieve the latest version.
Using the string `Latest` will retrieve the latest version.

# Artifacts generated

* OmniSharp binaries for specified runtimes `artifacts/publish/OmniSharp/{platform}/`
* Scripts to run OmniSharp at `scripts/OmniSharp(.Core)(.cmd)`
* These scripts are updated for every build and every install.
* The scripts point to the installed binary after and install, otherwise just the build folder (reset if a new build occurs without an install).
* Test logs in `artifacts/logs`
* Archived binaries in `artifacts/package` (only if `-archive` used on command line)
- OmniSharp binaries for specified runtimes `artifacts/publish/OmniSharp/{platform}/`
- Scripts to run OmniSharp at `scripts/OmniSharp(.Core)(.cmd)`
- These scripts are updated for every build and every install.
- The scripts point to the installed binary after and install, otherwise just the build folder (reset if a new build occurs without an install).
- Test logs in `artifacts/logs`
- Archived binaries in `artifacts/package` (only if `-archive` used on command line)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ Every merge to `master` is automatically published to this feed and individual r
- `win-x86`
- `win-arm64`
- `linux-x64`
- `linux-x86`
- `linux-musl-x64`
- `linux-arm64`
- `linux-musl-arm64`
- `linux-bionic-arm64`
- `osx`
- `mono` (Requires global mono installed)
- Extensions are archive specific, windows will be `zip` and all others will be `tar.gz`.
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ resources:

variables:
Verbosity: Diagnostic
DotNetVersion: "8.0.303"
DotNetVersion: "8.0.405"
CakeVersion: "4.2.0"
NuGetVersion: "6.5.0"
GitVersionVersion: "5.0.1"
Expand Down
1 change: 1 addition & 0 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,7 @@ Task("PublishNet6Builds")
PublishBuild(project, env, buildPlan, configuration, "linux-arm64", "net6.0");
PublishBuild(project, env, buildPlan, configuration, "linux-musl-x64", "net6.0");
PublishBuild(project, env, buildPlan, configuration, "linux-musl-arm64", "net6.0");
PublishBuild(project, env, buildPlan, configuration, "linux-bionic-arm64", "net6.0");
}
}
else if (Platform.Current.IsWindows)
Expand Down
4 changes: 2 additions & 2 deletions build.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"DotNetVersions": [
"6.0.203",
"7.0.410",
"8.0.303",
"9.0.101"
"8.0.405",
"9.0.102"
],
"RequiredMonoVersion": "6.6.0",
"DownloadURL": "https://roslynomnisharp.blob.core.windows.net/ext",
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.303",
"version": "9.0.102",
"rollForward": "latestMinor"
}
}
2 changes: 1 addition & 1 deletion test-assets/test-projects/Net80Project/global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "8.0.303"
"version": "8.0.405"
}
}
2 changes: 1 addition & 1 deletion test-assets/test-projects/Net90Project/global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "9.0.101"
"version": "9.0.102"
}
}
4 changes: 2 additions & 2 deletions tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ public async Task The_correct_sdk_version_is_emitted_NET8()
using var testProject = await TestAssets.Instance.GetTestProjectAsync("Net80Project");
using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
Assert.Single(emitter.ReceivedMessages);
Assert.Equal(GetHashedFileExtension("8.0.303"), emitter.ReceivedMessages[0].SdkVersion);
Assert.Equal(GetHashedFileExtension("8.0.405"), emitter.ReceivedMessages[0].SdkVersion);
}

[ConditionalFact(typeof(DotnetRuntimeOnly))]
Expand All @@ -255,7 +255,7 @@ public async Task The_correct_sdk_version_is_emitted_NET9()
using var testProject = await TestAssets.Instance.GetTestProjectAsync("Net90Project");
using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
Assert.Single(emitter.ReceivedMessages);
Assert.Equal(GetHashedFileExtension("9.0.101"), emitter.ReceivedMessages[0].SdkVersion);
Assert.Equal(GetHashedFileExtension("9.0.102"), emitter.ReceivedMessages[0].SdkVersion);
}

private string GetHashedFileExtension(string fileExtension)
Expand Down
2 changes: 1 addition & 1 deletion tests/OmniSharp.Tests/DotNetCliServiceFacts.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace OmniSharp.Tests
{
public class DotNetCliServiceFacts : AbstractTestFixture
{
private const string DotNetVersion = "8.0.303";
private const string DotNetVersion = "8.0.405";
private int Major { get; }
private int Minor { get; }
private int Patch { get; }
Expand Down
Loading