Skip to content

Commit ba33b33

Browse files
david-driscolldavid-driscoll
authored
Merge pull request #2105 from JoeRobich/update-roslyn4
Update Roslyn version to '3.10.0-1.21125.6'
2 parents 75c6ab9 + c8224cc commit ba33b33

19 files changed

Lines changed: 57 additions & 92 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
name: 'Build'
33
env:
4-
DotNetVersion: "5.0.102"
4+
DotNetVersion: "5.0.103"
55
DotNetVersion2: "3.1.405"
66
NuGetVersion: "5.7.0"
77
MonoVersion: "6.12.0"

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
name: 'Tests'
33
env:
4-
DotNetVersion: "5.0.102"
4+
DotNetVersion: "5.0.103"
55
DotNetVersion2: "3.1.405"
66
NuGetVersion: "5.7.0"
77
MonoVersion: "6.12.0"

‎.pipelines/init.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
# Configuration: Release
33
Verbosity: Normal
4-
DotNetVersion: "5.0.102"
4+
DotNetVersion: "5.0.103"
55
DotNetVersion2: "3.1.405"
66
CakeVersion: "1.0.0-rc0001"
77
NuGetVersion: "5.7.0"
@@ -28,7 +28,7 @@ steps:
2828
displayName: Install dotnet $(DotNetVersion2)
2929
inputs:
3030
packageType: 'sdk'
31-
version: ${{ parameters.DotNetVersion2 }}
31+
version: ${{ parameters.DotNetVersion2 }}
3232
- task: DotNetCoreCLI@2
3333
displayName: 'dotnet install cake'
3434
inputs:

‎NuGet.Config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
88
<add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
99
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
10+
<add key="vs-impl@Local" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl%40Local/nuget/v3/index.json" />
1011
<add key="OmniSharp" value="https://www.myget.org/F/omnisharp/api/v3/index.json" />
1112
</packageSources>
1213
</configuration>

‎azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ resources:
2828

2929
variables:
3030
Verbosity: Diagnostic
31-
DotNetVersion: "5.0.102"
31+
DotNetVersion: "5.0.103"
3232
DotNetVersion2: "3.1.405"
3333
CakeVersion: "1.0.0-rc0001"
3434
NuGetVersion: "5.7.0"

‎build.cake‎

Lines changed: 17 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -461,31 +461,20 @@ Task("CreateMSBuildFolder")
461461
FileHelper.Delete(CombinePaths(compilersTargetFolder, "vbc.exe.config"));
462462
FileHelper.Delete(CombinePaths(compilersTargetFolder, "vbc.rsp"));
463463

464-
FileHelper.Copy(
465-
source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.core", "lib", "net45", "SQLitePCLRaw.core.dll"),
464+
FileHelper.Copy(
465+
source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.core", "lib", "netstandard2.0", "SQLitePCLRaw.core.dll"),
466466
destination: CombinePaths(msbuildCurrentBinTargetFolder, "SQLitePCLRaw.core.dll"),
467467
overwrite: true);
468468

469469
FileHelper.Copy(
470-
source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.provider.e_sqlite3.net45", "lib", "net45", "SQLitePCLRaw.provider.e_sqlite3.dll"),
470+
source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.provider.e_sqlite3", "lib", "netstandard2.0", "SQLitePCLRaw.provider.e_sqlite3.dll"),
471471
destination: CombinePaths(msbuildCurrentBinTargetFolder, "SQLitePCLRaw.provider.e_sqlite3.dll"),
472472
overwrite: true);
473473

474474
FileHelper.Copy(
475-
source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net45", "SQLitePCLRaw.batteries_v2.dll"),
475+
source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "netstandard2.0", "SQLitePCLRaw.batteries_v2.dll"),
476476
destination: CombinePaths(msbuildCurrentBinTargetFolder, "SQLitePCLRaw.batteries_v2.dll"),
477477
overwrite: true);
478-
479-
FileHelper.Copy(
480-
source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net45", "SQLitePCLRaw.batteries_green.dll"),
481-
destination: CombinePaths(msbuildCurrentBinTargetFolder, "SQLitePCLRaw.batteries_green.dll"),
482-
overwrite: true);
483-
484-
var msbuild15TargetFolder = CombinePaths(env.Folders.MSBuild, "15.0");
485-
if (!Platform.Current.IsWindows)
486-
{
487-
DirectoryHelper.Copy(msbuildCurrentTargetFolder, msbuild15TargetFolder);
488-
}
489478
});
490479

491480
/// <summary>
@@ -696,27 +685,6 @@ void CopyMonoBuild(BuildEnvironment env, string sourceFolder, string outputFolde
696685

697686
var msbuildBinFolder = CombinePaths(msbuildFolder, "bin", "Current");
698687
EnsureDirectoryExists(msbuildBinFolder);
699-
700-
// Copy dependencies of Mono build
701-
FileHelper.Copy(
702-
source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.core", "lib", "net45", "SQLitePCLRaw.core.dll"),
703-
destination: CombinePaths(msbuildBinFolder, "SQLitePCLRaw.core.dll"),
704-
overwrite: true);
705-
706-
FileHelper.Copy(
707-
source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.provider.e_sqlite3.net45", "lib", "net45", "SQLitePCLRaw.provider.e_sqlite3.dll"),
708-
destination: CombinePaths(msbuildBinFolder, "SQLitePCLRaw.provider.e_sqlite3.dll"),
709-
overwrite: true);
710-
711-
FileHelper.Copy(
712-
source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net45", "SQLitePCLRaw.batteries_v2.dll"),
713-
destination: CombinePaths(msbuildBinFolder, "SQLitePCLRaw.batteries_v2.dll"),
714-
overwrite: true);
715-
716-
FileHelper.Copy(
717-
source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net45", "SQLitePCLRaw.batteries_green.dll"),
718-
destination: CombinePaths(msbuildBinFolder, "SQLitePCLRaw.batteries_green.dll"),
719-
overwrite: true);
720688
}
721689

722690
void CopyExtraDependencies(BuildEnvironment env, string outputFolder)
@@ -737,23 +705,19 @@ string PublishMonoBuild(string project, BuildEnvironment env, BuildPlan plan, st
737705

738706
CopyExtraDependencies(env, outputFolder);
739707

740-
// Copy dependencies of Mono build
741-
FileHelper.Copy(
742-
source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.core", "lib", "net45", "SQLitePCLRaw.core.dll"),
743-
destination: CombinePaths(outputFolder, "SQLitePCLRaw.core.dll"),
744-
overwrite: true);
745-
FileHelper.Copy(
746-
source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.provider.e_sqlite3.net45", "lib", "net45", "SQLitePCLRaw.provider.e_sqlite3.dll"),
747-
destination: CombinePaths(outputFolder, "SQLitePCLRaw.provider.e_sqlite3.dll"),
748-
overwrite: true);
749-
FileHelper.Copy(
750-
source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net45", "SQLitePCLRaw.batteries_v2.dll"),
751-
destination: CombinePaths(outputFolder, "SQLitePCLRaw.batteries_v2.dll"),
752-
overwrite: true);
753-
FileHelper.Copy(
754-
source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net45", "SQLitePCLRaw.batteries_green.dll"),
755-
destination: CombinePaths(outputFolder, "SQLitePCLRaw.batteries_green.dll"),
756-
overwrite: true);
708+
// Copy dependencies of Mono build
709+
FileHelper.Copy(
710+
source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.core", "lib", "netstandard2.0", "SQLitePCLRaw.core.dll"),
711+
destination: CombinePaths(outputFolder, "SQLitePCLRaw.core.dll"),
712+
overwrite: true);
713+
FileHelper.Copy(
714+
source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.provider.e_sqlite3", "lib", "netstandard2.0", "SQLitePCLRaw.provider.e_sqlite3.dll"),
715+
destination: CombinePaths(outputFolder, "SQLitePCLRaw.provider.e_sqlite3.dll"),
716+
overwrite: true);
717+
FileHelper.Copy(
718+
source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "netstandard2.0", "SQLitePCLRaw.batteries_v2.dll"),
719+
destination: CombinePaths(outputFolder, "SQLitePCLRaw.batteries_v2.dll"),
720+
overwrite: true);
757721

758722
Package(project, "mono", outputFolder, env.Folders.ArtifactsPackage, env.Folders.DeploymentPackage);
759723

‎build.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"DotNetVersions": [
55
"2.1.812",
66
"3.1.405",
7-
"5.0.102",
7+
"5.0.103",
88
"6.0.100-preview.1.21103.13"
99
],
1010
"RequiredMonoVersion": "6.6.0",
@@ -60,4 +60,4 @@
6060
"RestoreOnlyTestAssets": [
6161
"ProjectWithMissingType"
6262
]
63-
}
63+
}

‎build/Packages.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<MicrosoftExtensionPackageVersion>3.1.12</MicrosoftExtensionPackageVersion>
77
<MSBuildPackageVersion>16.9.0</MSBuildPackageVersion>
88
<NuGetPackageVersion>5.2.0</NuGetPackageVersion>
9-
<RoslynPackageVersion>3.9.0-6.21124.20</RoslynPackageVersion>
9+
<RoslynPackageVersion>3.10.0-1.21125.6</RoslynPackageVersion>
1010
<XunitPackageVersion>2.4.1</XunitPackageVersion>
1111
</PropertyGroup>
1212

@@ -66,7 +66,7 @@
6666
<PackageReference Update="OmniSharp.Extensions.LanguageServer" Version="0.19.0" />
6767
<PackageReference Update="OmniSharp.Extensions.LanguageProtocol.Testing" Version="0.19.0" />
6868

69-
<PackageReference Update="SQLitePCLRaw.bundle_green" Version="1.1.2" />
69+
<PackageReference Update="SQLitePCLRaw.bundle_green" Version="2.0.4" />
7070
<PackageReference Update="System.Collections.Immutable" Version="5.0.0" />
7171
<PackageReference Update="System.ComponentModel.Composition" Version="4.5.0" />
7272
<PackageReference Update="System.Composition" Version="1.0.31" />

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "5.0.102"
3+
"version": "5.0.103"
44
}
55
}

‎src/OmniSharp.Abstractions/Configuration.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ internal static class Configuration
44
{
55
public static bool ZeroBasedIndices = false;
66

7-
public const string RoslynVersion = "3.9.0.0";
7+
public const string RoslynVersion = "3.10.0.0";
88
public const string RoslynPublicKeyToken = "31bf3856ad364e35";
99

1010
public readonly static string RoslynFeatures = GetRoslynAssemblyFullName("Microsoft.CodeAnalysis.Features");

0 commit comments

Comments
 (0)