diff --git a/build.cake b/build.cake index 345ef50754..4b934c0c5d 100644 --- a/build.cake +++ b/build.cake @@ -504,76 +504,25 @@ Task("PublishNet6Builds") { foreach (var project in buildPlan.HostProjects) { - if (publishAll) - { - if (Platform.Current.IsWindows) - { - PublishBuild(project, env, buildPlan, configuration, "win7-x86", "net6.0"); - PublishBuild(project, env, buildPlan, configuration, "win7-x64", "net6.0"); - PublishBuild(project, env, buildPlan, configuration, "win10-arm64", "net6.0"); - } - else if (Platform.Current.IsMacOS) - { - PublishBuild(project, env, buildPlan, configuration, "osx-x64", "net6.0"); - PublishBuild(project, env, buildPlan, configuration, "osx-arm64", "net6.0"); - } - else - { - PublishBuild(project, env, buildPlan, configuration, "linux-x64", "net6.0"); - 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"); - } - } - else if (Platform.Current.IsWindows) - { - if (Platform.Current.IsX86) - { - PublishBuild(project, env, buildPlan, configuration, "win7-x86", "net6.0"); - } - else if (Platform.Current.IsX64) - { - PublishBuild(project, env, buildPlan, configuration, "win7-x64", "net6.0"); - } - else - { - PublishBuild(project, env, buildPlan, configuration, "win10-arm64", "net6.0"); - } - } - else - { - if (Platform.Current.IsMacOS) - { - PublishBuild(project, env, buildPlan, configuration, "osx-x64", "net6.0"); - PublishBuild(project, env, buildPlan, configuration, "osx-arm64", "net6.0"); - } - else - { - PublishBuild(project, env, buildPlan, configuration, "linux-x64", "net6.0"); - 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, "net6.0"); } }); -string PublishBuild(string project, BuildEnvironment env, BuildPlan plan, string configuration, string rid, string framework) +string PublishBuild(string project, BuildEnvironment env, BuildPlan plan, string configuration, string framework) { var projectName = project + ".csproj"; var projectFileName = CombinePaths(env.Folders.Source, project, projectName); - var outputFolder = CombinePaths(env.Folders.ArtifactsPublish, project, rid, framework); + var outputFolder = CombinePaths(env.Folders.ArtifactsPublish, project, framework); - Information("Publishing {0} for {1}...", projectName, rid); + Information("Publishing {0} for {1}...", projectName, framework); try { var publishSettings = new DotNetPublishSettings() { Framework = framework, - Runtime = rid, // TODO: With everything today do we need to publish this with a rid? This appears to be legacy bit when we used to push for all supported dotnet core rids. - PublishReadyToRun = true, // Improve startup performance by applying some AOT compilation + PublishReadyToRun = false, // Decrease size by NOT applying some AOT compilation + PublishTrimmed = false, // FIXME would be great to manage to trim SelfContained = false, // Since we are specifying a runtime identifier this defaults to true. We don't need to ship a runtime for net6 because we require the .NET SDK to be installed. Configuration = configuration, OutputDirectory = outputFolder, @@ -592,14 +541,14 @@ string PublishBuild(string project, BuildEnvironment env, BuildPlan plan, string } catch { - Error($"Failed to publish {project} for {rid}"); + Error($"Failed to publish {project} for {framework}"); throw; } CopyExtraDependencies(env, outputFolder); AddOmniSharpBindingRedirects(outputFolder); - var platformFolder = framework != "net472" ? $"{rid}-{framework}" : rid; + var platformFolder = $"{framework}"; Package(project, platformFolder, outputFolder, env.Folders.ArtifactsPackage, env.Folders.DeploymentPackage); return outputFolder; @@ -612,34 +561,7 @@ Task("PublishWindowsBuilds") { foreach (var project in buildPlan.HostProjects) { - string outputFolder; - - if (publishAll) - { - var outputFolderX86 = PublishBuild(project, env, buildPlan, configuration, "win7-x86", "net472"); - var outputFolderX64 = PublishBuild(project, env, buildPlan, configuration, "win7-x64", "net472"); - var outputFolderArm64 = PublishBuild(project, env, buildPlan, configuration, "win10-arm64", "net472"); - - outputFolder = Platform.Current.IsX86 - ? outputFolderX86 - : Platform.Current.IsX64 - ? outputFolderX64 - : outputFolderArm64; - } - else if (Platform.Current.IsX86) - { - outputFolder = PublishBuild(project, env, buildPlan, configuration, "win7-x86", "net472"); - } - else if (Platform.Current.IsX64) - { - outputFolder = PublishBuild(project, env, buildPlan, configuration, "win7-x64", "net472"); - } - else - { - outputFolder = PublishBuild(project, env, buildPlan, configuration, "win10-arm64", "net472"); - } - - CreateRunScript(project, outputFolder, env.Folders.ArtifactsScripts); + string outputFolder = PublishBuild(project, env, buildPlan, configuration, "net472"); } }); diff --git a/scripts/common.cake b/scripts/common.cake index b8053854a4..d4c1553ef6 100644 --- a/scripts/common.cake +++ b/scripts/common.cake @@ -283,10 +283,10 @@ public class BuildEnvironment return new GitVersion { - NuGetVersion = "0.0.1-local", - AssemblySemVer = "0.0.1.0", - InformationalVersion = "0.0.1-local", - SemVer = "0.0.1-local" + NuGetVersion = "1.39.10", + AssemblySemVer = "1.39.10.0", + InformationalVersion = "1.39.10", + SemVer = "1.39.10" }; } } diff --git a/src/OmniSharp.Benchmarks/OmniSharp.Benchmarks.csproj b/src/OmniSharp.Benchmarks/OmniSharp.Benchmarks.csproj index 90cfe1aa19..b3f2aa1753 100644 --- a/src/OmniSharp.Benchmarks/OmniSharp.Benchmarks.csproj +++ b/src/OmniSharp.Benchmarks/OmniSharp.Benchmarks.csproj @@ -5,6 +5,7 @@ net472 enable 9.0 + en diff --git a/src/OmniSharp.Cake/OmniSharp.Cake.csproj b/src/OmniSharp.Cake/OmniSharp.Cake.csproj index 55bbc19721..906ea9d7e6 100644 --- a/src/OmniSharp.Cake/OmniSharp.Cake.csproj +++ b/src/OmniSharp.Cake/OmniSharp.Cake.csproj @@ -3,6 +3,7 @@ net6.0;net472 AnyCPU + en diff --git a/src/OmniSharp.DotNetTest/OmniSharp.DotNetTest.csproj b/src/OmniSharp.DotNetTest/OmniSharp.DotNetTest.csproj index c28a9288d9..1e0fdc75ac 100644 --- a/src/OmniSharp.DotNetTest/OmniSharp.DotNetTest.csproj +++ b/src/OmniSharp.DotNetTest/OmniSharp.DotNetTest.csproj @@ -3,6 +3,7 @@ net6.0;net472 AnyCPU + en diff --git a/src/OmniSharp.Host/OmniSharp.Host.csproj b/src/OmniSharp.Host/OmniSharp.Host.csproj index a2faea592f..653057fa3a 100644 --- a/src/OmniSharp.Host/OmniSharp.Host.csproj +++ b/src/OmniSharp.Host/OmniSharp.Host.csproj @@ -6,6 +6,7 @@ OmniSharp true true + en diff --git a/src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj b/src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj index bb3945d3ef..0a4e4a5188 100644 --- a/src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj +++ b/src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj @@ -12,6 +12,7 @@ 6.0.0-preview.7.21317.1 LatestMajor true + en diff --git a/src/OmniSharp.Http/OmniSharp.Http.csproj b/src/OmniSharp.Http/OmniSharp.Http.csproj index e9586447ea..776c9c2103 100644 --- a/src/OmniSharp.Http/OmniSharp.Http.csproj +++ b/src/OmniSharp.Http/OmniSharp.Http.csproj @@ -3,6 +3,7 @@ net6.0;net472 AnyCPU + en diff --git a/src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj b/src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj index 3ba8f94765..90bb3c9056 100644 --- a/src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj +++ b/src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj @@ -10,6 +10,7 @@ 6.0.0-preview.7.21317.1 LatestMajor + en diff --git a/src/OmniSharp.MSBuild/OmniSharp.MSBuild.csproj b/src/OmniSharp.MSBuild/OmniSharp.MSBuild.csproj index 3581e6dbad..3859d4c583 100644 --- a/src/OmniSharp.MSBuild/OmniSharp.MSBuild.csproj +++ b/src/OmniSharp.MSBuild/OmniSharp.MSBuild.csproj @@ -5,6 +5,7 @@ AnyCPU true true + en diff --git a/src/OmniSharp.Plugins/OmniSharp.Plugins.csproj b/src/OmniSharp.Plugins/OmniSharp.Plugins.csproj index aa0ecda69b..17886ef8e4 100644 --- a/src/OmniSharp.Plugins/OmniSharp.Plugins.csproj +++ b/src/OmniSharp.Plugins/OmniSharp.Plugins.csproj @@ -3,6 +3,7 @@ net472 AnyCPU + en diff --git a/src/OmniSharp.Roslyn.CSharp/OmniSharp.Roslyn.CSharp.csproj b/src/OmniSharp.Roslyn.CSharp/OmniSharp.Roslyn.CSharp.csproj index 004dc8fc5b..72a518cfe4 100644 --- a/src/OmniSharp.Roslyn.CSharp/OmniSharp.Roslyn.CSharp.csproj +++ b/src/OmniSharp.Roslyn.CSharp/OmniSharp.Roslyn.CSharp.csproj @@ -5,6 +5,7 @@ AnyCPU true true + en diff --git a/src/OmniSharp.Roslyn/OmniSharp.Roslyn.csproj b/src/OmniSharp.Roslyn/OmniSharp.Roslyn.csproj index 5de02185b1..59a2009c99 100644 --- a/src/OmniSharp.Roslyn/OmniSharp.Roslyn.csproj +++ b/src/OmniSharp.Roslyn/OmniSharp.Roslyn.csproj @@ -5,6 +5,7 @@ AnyCPU true true + en diff --git a/src/OmniSharp.Script/OmniSharp.Script.csproj b/src/OmniSharp.Script/OmniSharp.Script.csproj index 688566d94c..bf693d2967 100644 --- a/src/OmniSharp.Script/OmniSharp.Script.csproj +++ b/src/OmniSharp.Script/OmniSharp.Script.csproj @@ -3,6 +3,7 @@ net6.0;net472 AnyCPU + en diff --git a/src/OmniSharp.Shared/OmniSharp.Shared.csproj b/src/OmniSharp.Shared/OmniSharp.Shared.csproj index 2c111b148d..ec478c49a5 100644 --- a/src/OmniSharp.Shared/OmniSharp.Shared.csproj +++ b/src/OmniSharp.Shared/OmniSharp.Shared.csproj @@ -6,6 +6,7 @@ OmniSharp true true + en diff --git a/src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj b/src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj index aa80b2c2c5..86f2f37aac 100644 --- a/src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj +++ b/src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj @@ -12,6 +12,7 @@ 6.0.0-preview.7.21317.1 LatestMajor true + en diff --git a/src/OmniSharp.Stdio/OmniSharp.Stdio.csproj b/src/OmniSharp.Stdio/OmniSharp.Stdio.csproj index 038f3fb55d..63d54a7fd5 100644 --- a/src/OmniSharp.Stdio/OmniSharp.Stdio.csproj +++ b/src/OmniSharp.Stdio/OmniSharp.Stdio.csproj @@ -3,6 +3,7 @@ net6.0;net472 AnyCPU + en