From d40393d23479eccb4536098c9ec070fe834daa6b Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Tue, 2 Mar 2021 14:12:37 -0800 Subject: [PATCH 1/3] Update to NET 5.0.103 SDK --- .github/workflows/build.yml | 2 +- .github/workflows/tests.yml | 2 +- .pipelines/init.yml | 4 ++-- azure-pipelines.yml | 2 +- build.json | 4 ++-- global.json | 2 +- test-assets/test-projects/ExternAlias/global.json | 2 +- test-assets/test-projects/Net50Project/global.json | 4 ++-- tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs | 2 +- tests/OmniSharp.Tests/DotNetCliServiceFacts.cs | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a69b204d5..d5fc0c0bf8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ name: 'Build' env: - DotNetVersion: "5.0.102" + DotNetVersion: "5.0.103" DotNetVersion2: "3.1.405" NuGetVersion: "5.7.0" MonoVersion: "6.12.0" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c30afe00c9..26ee8ed6ed 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,7 +1,7 @@ name: 'Tests' env: - DotNetVersion: "5.0.102" + DotNetVersion: "5.0.103" DotNetVersion2: "3.1.405" NuGetVersion: "5.7.0" MonoVersion: "6.12.0" diff --git a/.pipelines/init.yml b/.pipelines/init.yml index 89940bea0c..0caea6b9ae 100644 --- a/.pipelines/init.yml +++ b/.pipelines/init.yml @@ -1,7 +1,7 @@ parameters: # Configuration: Release Verbosity: Normal - DotNetVersion: "5.0.102" + DotNetVersion: "5.0.103" DotNetVersion2: "3.1.405" CakeVersion: "1.0.0-rc0001" NuGetVersion: "5.7.0" @@ -28,7 +28,7 @@ steps: displayName: Install dotnet $(DotNetVersion2) inputs: packageType: 'sdk' - version: ${{ parameters.DotNetVersion2 }} + version: ${{ parameters.DotNetVersion2 }} - task: DotNetCoreCLI@2 displayName: 'dotnet install cake' inputs: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dcf21d0713..aa6ce65331 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,7 +28,7 @@ resources: variables: Verbosity: Diagnostic - DotNetVersion: "5.0.102" + DotNetVersion: "5.0.103" DotNetVersion2: "3.1.405" CakeVersion: "1.0.0-rc0001" NuGetVersion: "5.7.0" diff --git a/build.json b/build.json index 0ed3e5f35d..ba5650c58b 100644 --- a/build.json +++ b/build.json @@ -4,7 +4,7 @@ "DotNetVersions": [ "2.1.812", "3.1.405", - "5.0.102", + "5.0.103", "6.0.100-preview.1.21103.13" ], "RequiredMonoVersion": "6.6.0", @@ -60,4 +60,4 @@ "RestoreOnlyTestAssets": [ "ProjectWithMissingType" ] -} +} \ No newline at end of file diff --git a/global.json b/global.json index 88f484309d..12fe1d6115 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "5.0.102" + "version": "5.0.103" } } \ No newline at end of file diff --git a/test-assets/test-projects/ExternAlias/global.json b/test-assets/test-projects/ExternAlias/global.json index 88f484309d..12fe1d6115 100644 --- a/test-assets/test-projects/ExternAlias/global.json +++ b/test-assets/test-projects/ExternAlias/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "5.0.102" + "version": "5.0.103" } } \ No newline at end of file diff --git a/test-assets/test-projects/Net50Project/global.json b/test-assets/test-projects/Net50Project/global.json index 7858fc9fac..12fe1d6115 100644 --- a/test-assets/test-projects/Net50Project/global.json +++ b/test-assets/test-projects/Net50Project/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "5.0.102" + "version": "5.0.103" } -} +} \ No newline at end of file diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs index 313459bda2..717287d272 100644 --- a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs +++ b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs @@ -221,7 +221,7 @@ public async Task The_correct_sdk_version_is_emitted_NET5() using var testProject = await TestAssets.Instance.GetTestProjectAsync("Net50Project"); using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory)); Assert.Equal(2, emitter.ReceivedMessages.Length); - Assert.Equal(GetHashedFileExtension("5.0.102"), emitter.ReceivedMessages[0].SdkVersion); + Assert.Equal(GetHashedFileExtension("5.0.103"), emitter.ReceivedMessages[0].SdkVersion); } [Fact] diff --git a/tests/OmniSharp.Tests/DotNetCliServiceFacts.cs b/tests/OmniSharp.Tests/DotNetCliServiceFacts.cs index a7b428933f..5de6b0c88f 100644 --- a/tests/OmniSharp.Tests/DotNetCliServiceFacts.cs +++ b/tests/OmniSharp.Tests/DotNetCliServiceFacts.cs @@ -8,7 +8,7 @@ namespace OmniSharp.Tests { public class DotNetCliServiceFacts : AbstractTestFixture { - private const string DotNetVersion = "5.0.102"; + private const string DotNetVersion = "5.0.103"; private int Major { get; } private int Minor { get; } private int Patch { get; } From 928227cac5a48eb0d65f5be91b72cfdf2c67ba5f Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Tue, 2 Mar 2021 14:43:52 -0800 Subject: [PATCH 2/3] Update Roslyn version to '3.10.0-1.21125.6' - Add vs-impl nuget feed - Update binding redirects for Roslyn 3.10.0 --- NuGet.Config | 1 + build/Packages.props | 4 ++-- src/OmniSharp.Abstractions/Configuration.cs | 2 +- src/OmniSharp.Http.Driver/app.config | 10 +++++----- src/OmniSharp.LanguageServerProtocol/app.config | 10 +++++----- src/OmniSharp.Stdio.Driver/app.config | 10 +++++----- tests/app.config | 10 +++++----- 7 files changed, 24 insertions(+), 23 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index f2f531821f..1abdec3a52 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -7,6 +7,7 @@ + diff --git a/build/Packages.props b/build/Packages.props index a46e4b7d34..d722bea100 100644 --- a/build/Packages.props +++ b/build/Packages.props @@ -6,7 +6,7 @@ 3.1.12 16.9.0 5.2.0 - 3.9.0-6.21124.20 + 3.10.0-1.21125.6 2.4.1 @@ -66,7 +66,7 @@ - + diff --git a/src/OmniSharp.Abstractions/Configuration.cs b/src/OmniSharp.Abstractions/Configuration.cs index d34e9120c1..ca72a2bf0b 100644 --- a/src/OmniSharp.Abstractions/Configuration.cs +++ b/src/OmniSharp.Abstractions/Configuration.cs @@ -4,7 +4,7 @@ internal static class Configuration { public static bool ZeroBasedIndices = false; - public const string RoslynVersion = "3.9.0.0"; + public const string RoslynVersion = "3.10.0.0"; public const string RoslynPublicKeyToken = "31bf3856ad364e35"; public readonly static string RoslynFeatures = GetRoslynAssemblyFullName("Microsoft.CodeAnalysis.Features"); diff --git a/src/OmniSharp.Http.Driver/app.config b/src/OmniSharp.Http.Driver/app.config index 751f54f28d..7fbdd2c499 100644 --- a/src/OmniSharp.Http.Driver/app.config +++ b/src/OmniSharp.Http.Driver/app.config @@ -7,23 +7,23 @@ - + - + - + - + - + diff --git a/src/OmniSharp.LanguageServerProtocol/app.config b/src/OmniSharp.LanguageServerProtocol/app.config index 3e467078a0..63f3e13f1d 100644 --- a/src/OmniSharp.LanguageServerProtocol/app.config +++ b/src/OmniSharp.LanguageServerProtocol/app.config @@ -7,23 +7,23 @@ - + - + - + - + - + diff --git a/src/OmniSharp.Stdio.Driver/app.config b/src/OmniSharp.Stdio.Driver/app.config index 751f54f28d..7fbdd2c499 100644 --- a/src/OmniSharp.Stdio.Driver/app.config +++ b/src/OmniSharp.Stdio.Driver/app.config @@ -7,23 +7,23 @@ - + - + - + - + - + diff --git a/tests/app.config b/tests/app.config index 1eb08705b3..300c70615a 100644 --- a/tests/app.config +++ b/tests/app.config @@ -7,23 +7,23 @@ - + - + - + - + - + From d940fb8b6cc8a748135521734a712e6b846b6df6 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Tue, 2 Mar 2021 16:31:10 -0800 Subject: [PATCH 3/3] Update SQLitePCLRaw version to '2.0.4' - Update paths for SQLitePCLRaw when building MSBuild - Remove unnecessary file copying from build --- build.cake | 70 +++++++++++-------------------------------- tools/packages.config | 6 ++-- 2 files changed, 20 insertions(+), 56 deletions(-) diff --git a/build.cake b/build.cake index 61a4ddd6b1..4eb6974137 100644 --- a/build.cake +++ b/build.cake @@ -461,31 +461,20 @@ Task("CreateMSBuildFolder") FileHelper.Delete(CombinePaths(compilersTargetFolder, "vbc.exe.config")); FileHelper.Delete(CombinePaths(compilersTargetFolder, "vbc.rsp")); - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.core", "lib", "net45", "SQLitePCLRaw.core.dll"), + FileHelper.Copy( + source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.core", "lib", "netstandard2.0", "SQLitePCLRaw.core.dll"), destination: CombinePaths(msbuildCurrentBinTargetFolder, "SQLitePCLRaw.core.dll"), overwrite: true); FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.provider.e_sqlite3.net45", "lib", "net45", "SQLitePCLRaw.provider.e_sqlite3.dll"), + source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.provider.e_sqlite3", "lib", "netstandard2.0", "SQLitePCLRaw.provider.e_sqlite3.dll"), destination: CombinePaths(msbuildCurrentBinTargetFolder, "SQLitePCLRaw.provider.e_sqlite3.dll"), overwrite: true); FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net45", "SQLitePCLRaw.batteries_v2.dll"), + source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "netstandard2.0", "SQLitePCLRaw.batteries_v2.dll"), destination: CombinePaths(msbuildCurrentBinTargetFolder, "SQLitePCLRaw.batteries_v2.dll"), overwrite: true); - - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net45", "SQLitePCLRaw.batteries_green.dll"), - destination: CombinePaths(msbuildCurrentBinTargetFolder, "SQLitePCLRaw.batteries_green.dll"), - overwrite: true); - - var msbuild15TargetFolder = CombinePaths(env.Folders.MSBuild, "15.0"); - if (!Platform.Current.IsWindows) - { - DirectoryHelper.Copy(msbuildCurrentTargetFolder, msbuild15TargetFolder); - } }); /// @@ -696,27 +685,6 @@ void CopyMonoBuild(BuildEnvironment env, string sourceFolder, string outputFolde var msbuildBinFolder = CombinePaths(msbuildFolder, "bin", "Current"); EnsureDirectoryExists(msbuildBinFolder); - - // Copy dependencies of Mono build - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.core", "lib", "net45", "SQLitePCLRaw.core.dll"), - destination: CombinePaths(msbuildBinFolder, "SQLitePCLRaw.core.dll"), - overwrite: true); - - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.provider.e_sqlite3.net45", "lib", "net45", "SQLitePCLRaw.provider.e_sqlite3.dll"), - destination: CombinePaths(msbuildBinFolder, "SQLitePCLRaw.provider.e_sqlite3.dll"), - overwrite: true); - - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net45", "SQLitePCLRaw.batteries_v2.dll"), - destination: CombinePaths(msbuildBinFolder, "SQLitePCLRaw.batteries_v2.dll"), - overwrite: true); - - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net45", "SQLitePCLRaw.batteries_green.dll"), - destination: CombinePaths(msbuildBinFolder, "SQLitePCLRaw.batteries_green.dll"), - overwrite: true); } void CopyExtraDependencies(BuildEnvironment env, string outputFolder) @@ -737,23 +705,19 @@ string PublishMonoBuild(string project, BuildEnvironment env, BuildPlan plan, st CopyExtraDependencies(env, outputFolder); - // Copy dependencies of Mono build - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.core", "lib", "net45", "SQLitePCLRaw.core.dll"), - destination: CombinePaths(outputFolder, "SQLitePCLRaw.core.dll"), - overwrite: true); - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.provider.e_sqlite3.net45", "lib", "net45", "SQLitePCLRaw.provider.e_sqlite3.dll"), - destination: CombinePaths(outputFolder, "SQLitePCLRaw.provider.e_sqlite3.dll"), - overwrite: true); - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net45", "SQLitePCLRaw.batteries_v2.dll"), - destination: CombinePaths(outputFolder, "SQLitePCLRaw.batteries_v2.dll"), - overwrite: true); - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net45", "SQLitePCLRaw.batteries_green.dll"), - destination: CombinePaths(outputFolder, "SQLitePCLRaw.batteries_green.dll"), - overwrite: true); + // Copy dependencies of Mono build + FileHelper.Copy( + source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.core", "lib", "netstandard2.0", "SQLitePCLRaw.core.dll"), + destination: CombinePaths(outputFolder, "SQLitePCLRaw.core.dll"), + overwrite: true); + FileHelper.Copy( + source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.provider.e_sqlite3", "lib", "netstandard2.0", "SQLitePCLRaw.provider.e_sqlite3.dll"), + destination: CombinePaths(outputFolder, "SQLitePCLRaw.provider.e_sqlite3.dll"), + overwrite: true); + FileHelper.Copy( + source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "netstandard2.0", "SQLitePCLRaw.batteries_v2.dll"), + destination: CombinePaths(outputFolder, "SQLitePCLRaw.batteries_v2.dll"), + overwrite: true); Package(project, "mono", outputFolder, env.Folders.ArtifactsPackage, env.Folders.DeploymentPackage); diff --git a/tools/packages.config b/tools/packages.config index 003dd01c46..96e1ec14f2 100644 --- a/tools/packages.config +++ b/tools/packages.config @@ -28,9 +28,9 @@ - - - + + +