Skip to content

Commit 028f592

Browse files
JoeRobichJoeRobich
authored
Update SDKs (#2652)
2 parents 78a5e81 + 0a10c62 commit 028f592

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+156
-109
lines changed

‎.github/workflows/build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
name: "Build"
22
env:
3-
DotNetVersion: "9.0.101"
4-
DotNetVersion2: "8.0.303"
5-
DotNetVersion3: "7.0.410"
6-
DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
3+
DotNetVersion: "10.0.100-preview.6.25358.103"
4+
DotNetVersion2: "9.0.303"
5+
DotNetVersion3: "8.0.412"
6+
DotNetVersion4: "6.0.428"
7+
DotNetVersion5: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
78
NuGetVersion: "6.5.0"
89
MonoVersion: "6.12.0"
910
Artifacts: ${{ github.workspace }}/artifacts/
@@ -45,6 +46,7 @@ jobs:
4546
uses: actions/setup-dotnet@v3
4647
with:
4748
dotnet-version: |
49+
${{ env.DotNetVersion5 }}
4850
${{ env.DotNetVersion4 }}
4951
${{ env.DotNetVersion3 }}
5052
${{ env.DotNetVersion2 }}

‎.github/workflows/tests-net6.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
name: "Tests net6.0"
22
env:
3-
DotNetVersion: "9.0.101"
4-
DotNetVersion2: "8.0.303"
5-
DotNetVersion3: "7.0.410"
6-
DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
3+
DotNetVersion: "10.0.100-preview.6.25358.103"
4+
DotNetVersion2: "9.0.303"
5+
DotNetVersion3: "8.0.412"
6+
DotNetVersion4: "6.0.428"
7+
DotNetVersion5: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
78
NuGetVersion: "6.5.0"
89
MonoVersion: "6.12.0"
910
Artifacts: ${{ github.workspace }}/artifacts/
1011
Coverage: ${{ github.workspace }}/coverage/
1112
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: "true"
13+
VSTEST_TESTHOST_SHUTDOWN_TIMEOUT: "1000"
1214
defaults:
1315
run:
1416
shell: pwsh
@@ -47,6 +49,7 @@ jobs:
4749
uses: actions/setup-dotnet@v3
4850
with:
4951
dotnet-version: |
52+
${{ env.DotNetVersion5 }}
5053
${{ env.DotNetVersion4 }}
5154
${{ env.DotNetVersion3 }}
5255
${{ env.DotNetVersion2 }}

‎.github/workflows/tests.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
name: "Tests"
22
env:
3-
DotNetVersion: "9.0.101"
4-
DotNetVersion2: "8.0.303"
5-
DotNetVersion3: "7.0.410"
6-
DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
3+
DotNetVersion: "10.0.100-preview.6.25358.103"
4+
DotNetVersion2: "9.0.303"
5+
DotNetVersion3: "8.0.412"
6+
DotNetVersion4: "6.0.428"
7+
DotNetVersion5: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
78
NuGetVersion: "6.5.0"
89
MonoVersion: "6.12.0"
910
Artifacts: ${{ github.workspace }}/artifacts/
@@ -47,6 +48,7 @@ jobs:
4748
uses: actions/setup-dotnet@v3
4849
with:
4950
dotnet-version: |
51+
${{ env.DotNetVersion5 }}
5052
${{ env.DotNetVersion4 }}
5153
${{ env.DotNetVersion3 }}
5254
${{ env.DotNetVersion2 }}

‎.pipelines/init.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
# Configuration: Release
33
Verbosity: Normal
4-
DotNetVersion: "8.0.303"
4+
DotNetVersion: "10.0.100-preview.6.25358.103"
55
CakeVersion: "1.1.0"
66
NuGetVersion: "5.7.0"
77
MonoVersion: ""

‎Directory.Build.props

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

88
<Import Project="build\Settings.props" />
99

10-
</Project>
10+
</Project>

‎Directory.Packages.props

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<OmniSharpExtensionsPackageVersion>0.19.9</OmniSharpExtensionsPackageVersion>
88
<MicrosoftExtensionPackageVersion>9.0.0</MicrosoftExtensionPackageVersion>
99
<MicrosoftBaseCommonLibraryVersion>9.0.0</MicrosoftBaseCommonLibraryVersion>
10-
<MicrosoftTestPackageVersion>17.8.0</MicrosoftTestPackageVersion>
10+
<MicrosoftTestPackageVersion>17.14.0-preview-25107-01</MicrosoftTestPackageVersion>
1111
<MSBuildPackageVersion>17.3.2</MSBuildPackageVersion>
12-
<NuGetPackageVersion>6.14.0-rc.116</NuGetPackageVersion>
12+
<NuGetPackageVersion>6.15.0-preview.1.86</NuGetPackageVersion>
1313
<RoslynPackageVersion>4.14.0-3.25168.13</RoslynPackageVersion>
14-
<XunitPackageVersion>2.6.1</XunitPackageVersion>
14+
<XunitPackageVersion>2.8.1</XunitPackageVersion>
1515
</PropertyGroup>
1616

1717
<ItemGroup>
@@ -31,6 +31,7 @@
3131

3232
<PackageVersion Include="Microsoft.Build" Version="$(MSBuildPackageVersion)" />
3333
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MSBuildPackageVersion)" />
34+
<PackageVersion Include="Microsoft.Build.Locator" Version="1.6.10" />
3435
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MSBuildPackageVersion)" />
3536
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MSBuildPackageVersion)" />
3637

@@ -59,7 +60,7 @@
5960
<PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionPackageVersion)" />
6061
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionPackageVersion)" />
6162

62-
<PackageVersion Include="Microsoft.Build.Locator" Version="1.6.10" />
63+
<PackageVersion Include="Microsoft.IO.Redist" Version="6.1.0" />
6364

6465
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestPackageVersion)" />
6566
<PackageVersion Include="Microsoft.TestPlatform.TranslationLayer" Version="$(MicrosoftTestPackageVersion)" />
@@ -87,7 +88,7 @@
8788
<PackageVersion Include="System.ComponentModel.Composition" Version="$(MicrosoftBaseCommonLibraryVersion)" />
8889
<PackageVersion Include="System.Composition" Version="$(MicrosoftBaseCommonLibraryVersion)" />
8990
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(MicrosoftBaseCommonLibraryVersion)" />
90-
<PackageVersion Include="System.Memory" Version="4.5.5" />
91+
<PackageVersion Include="System.Memory" Version="4.6.0" />
9192
<PackageVersion Include="System.Reflection.Metadata" Version="$(MicrosoftBaseCommonLibraryVersion)" />
9293
<PackageVersion Include="System.Text.Json" Version="$(MicrosoftBaseCommonLibraryVersion)" />
9394
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="$(MicrosoftBaseCommonLibraryVersion)" />
@@ -96,7 +97,7 @@
9697
<PackageVersion Include="System.Reactive" Version="6.0.0" />
9798

9899
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />
99-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.4" />
100+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
100101
<PackageVersion Include="xunit" Version="$(XunitPackageVersion)" />
101102
</ItemGroup>
102103
<ItemGroup>

‎azure-pipelines.yml

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

1818
variables:
1919
Verbosity: Diagnostic
20-
DotNetVersion: "8.0.303"
20+
DotNetVersion: "10.0.100-preview.6.25358.103"
2121
CakeVersion: "4.2.0"
2222
NuGetVersion: "6.5.0"
2323
GitVersionVersion: "5.0.1"

‎build.cake

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,30 +294,37 @@ Task("Test")
294294
.IsDependentOn("PrepareTestAssets")
295295
.Does(() =>
296296
{
297-
var testTargetFramework = useDotNetTest ? "net8.0" : "net472";
297+
var testTargetFramework = useDotNetTest ? "net10.0" : "net472";
298298
var testProjects = string.IsNullOrEmpty(testProjectArgument) ? buildPlan.TestProjects : testProjectArgument.Split(',');
299+
var environment = new Dictionary<string, string>();
300+
301+
if (!useDotNetTest && Platform.Current.IsWindows)
302+
{
303+
environment.Add("DOTNET_PATH", env.Folders.DotNetSdk);
304+
}
305+
299306
foreach (var testProject in testProjects)
300307
{
301308
PrintBlankLine();
302309
var instanceFolder = CombinePaths(env.Folders.Bin, configuration, testProject, testTargetFramework);
303310
var targetPath = CombinePaths(instanceFolder, $"{testProject}.dll");
304311

305-
if (useDotNetTest)
312+
if (useDotNetTest || Platform.Current.IsWindows)
306313
{
307314
var logFile = CombinePaths(env.Folders.ArtifactsLogs, $"{testProject}-netsdk-result.xml");
308315
var arguments = $"test \"{targetPath}\" --logger \"console;verbosity=normal\" --logger \"trx;LogFileName={logFile}\" --blame-hang-timeout 60sec";
309316

310317
Console.WriteLine($"Executing: dotnet {arguments}");
311318

312-
Run("dotnet", arguments, instanceFolder)
319+
Run("dotnet", arguments, new RunOptions(workingDirectory: instanceFolder, environment: environment))
313320
.ExceptionOnError($"Test {testProject} failed for {testTargetFramework}");
314321
}
315322
else
316323
{
317324
var logFile = CombinePaths(env.Folders.ArtifactsLogs, $"{testProject}-desktop-result.xml");
318325

319326
// Copy xunit executable to test folder to solve path errors
320-
var xunitToolsFolder = CombinePaths(env.Folders.Tools, "xunit.runner.console", "tools", "net452");
327+
var xunitToolsFolder = CombinePaths(env.Folders.Tools, "xunit.runner.console", "tools", "net472");
321328
var xunitInstancePath = CombinePaths(instanceFolder, "xunit.console.exe");
322329
FileHelper.Copy(CombinePaths(xunitToolsFolder, "xunit.console.exe"), xunitInstancePath, overwrite: true);
323330
FileHelper.Copy(CombinePaths(xunitToolsFolder, "xunit.runner.utility.net452.dll"), CombinePaths(instanceFolder, "xunit.runner.utility.net452.dll"), overwrite: true);

‎build.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
"DotNetChannel": "Preview",
44
"DotNetVersions": [
55
"6.0.203",
6-
"7.0.410",
7-
"8.0.303",
8-
"9.0.101"
6+
"6.0.428",
7+
"8.0.412",
8+
"9.0.303",
9+
"10.0.100-preview.6.25358.103"
910
],
1011
"RequiredMonoVersion": "6.6.0",
1112
"DownloadURL": "https://roslynomnisharp.blob.core.windows.net/ext",
@@ -55,4 +56,4 @@
5556
"RestoreOnlyTestAssets": [
5657
"ProjectWithMissingType"
5758
]
58-
}
59+
}

‎build/Settings.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
99
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
1010
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
11-
<NoWarn>NU1701;NU5104;NU1903</NoWarn>
11+
<NoWarn>NU1701;NU5104;NU1901;NU1903</NoWarn>
1212
<IsPackable>false</IsPackable>
1313
<Authors>OmniSharp Contributors</Authors>
1414
<PackageTags>omnisharp;lsp;csharp;roslyn;language</PackageTags>

0 commit comments

Comments
 (0)