Skip to content

Commit b580b56

Browse files
authored
[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' (#20297)
2 parents 99da6f4 + 7289027 commit b580b56

File tree

3 files changed

+21
-22
lines changed

3 files changed

+21
-22
lines changed

NuGet.config

+17-18
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,8 @@
1818
<add key="darc-int-dotnet-aspnetcore-31d685b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-2/nuget/v3/index.json" />
1919
<add key="darc-int-dotnet-aspnetcore-31d685b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-1/nuget/v3/index.json" />
2020
<!-- End: Package sources from dotnet-aspnetcore -->
21-
<!-- Begin: Package sources from dotnet-emsdk -->
22-
<!-- End: Package sources from dotnet-emsdk -->
2321
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2422
<add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
25-
<add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-3/nuget/v3/index.json" />
26-
<add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-2/nuget/v3/index.json" />
27-
<add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-1/nuget/v3/index.json" />
28-
<!-- End: Package sources from dotnet-emsdk -->
29-
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3023
<!-- End: Package sources from dotnet-windowsdesktop -->
3124
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
3225
<add key="darc-pub-DotNet-msbuild-Trusted-a69bbaa" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a69bbaaf/nuget/v3/index.json" />
@@ -35,13 +28,15 @@
3528
<add key="darc-int-dotnet-runtime-89ef51c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5/nuget/v3/index.json" />
3629
<add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
3730
<!-- End: Package sources from dotnet-runtime -->
38-
<!-- Begin: Package sources from dotnet-windowsdesktop -->
39-
<!-- End: Package sources from dotnet-windowsdesktop -->
4031
<!-- Begin: Package sources from dotnet-sdk -->
41-
<add key="darc-int-dotnet-sdk-f6ad34c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f6ad34c0/nuget/v3/index.json" />
42-
<add key="darc-int-dotnet-sdk-f6ad34c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f6ad34c0-3/nuget/v3/index.json" />
43-
<add key="darc-int-dotnet-sdk-f6ad34c-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f6ad34c0-2/nuget/v3/index.json" />
44-
<add key="darc-int-dotnet-sdk-f6ad34c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f6ad34c0-1/nuget/v3/index.json" />
32+
<add key="darc-int-dotnet-sdk-55a73a0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e/nuget/v3/index.json" />
33+
<add key="darc-int-dotnet-sdk-55a73a0-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-7/nuget/v3/index.json" />
34+
<add key="darc-int-dotnet-sdk-55a73a0-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-6/nuget/v3/index.json" />
35+
<add key="darc-int-dotnet-sdk-55a73a0-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-5/nuget/v3/index.json" />
36+
<add key="darc-int-dotnet-sdk-55a73a0-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-4/nuget/v3/index.json" />
37+
<add key="darc-int-dotnet-sdk-55a73a0-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-3/nuget/v3/index.json" />
38+
<add key="darc-int-dotnet-sdk-55a73a0-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-2/nuget/v3/index.json" />
39+
<add key="darc-int-dotnet-sdk-55a73a0-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-1/nuget/v3/index.json" />
4540
<!-- End: Package sources from dotnet-sdk -->
4641
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4742
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -68,19 +63,23 @@
6863
<!-- Begin: Package sources from dotnet-runtime -->
6964
<add key="darc-int-dotnet-runtime-89ef51c-3" value="true" />
7065
<add key="darc-int-dotnet-runtime-89ef51c" value="true" />
66+
<!-- End: Package sources from dotnet-runtime -->
7167
<!-- Begin: Package sources from dotnet-sdk -->
72-
<add key="darc-int-dotnet-sdk-f6ad34c-1" value="true" />
73-
<add key="darc-int-dotnet-sdk-f6ad34c-2" value="true" />
74-
<add key="darc-int-dotnet-sdk-f6ad34c-3" value="true" />
75-
<add key="darc-int-dotnet-sdk-f6ad34c" value="true" />
68+
<add key="darc-int-dotnet-sdk-55a73a0-1" value="true" />
69+
<add key="darc-int-dotnet-sdk-55a73a0-2" value="true" />
70+
<add key="darc-int-dotnet-sdk-55a73a0-3" value="true" />
71+
<add key="darc-int-dotnet-sdk-55a73a0-4" value="true" />
72+
<add key="darc-int-dotnet-sdk-55a73a0-5" value="true" />
73+
<add key="darc-int-dotnet-sdk-55a73a0-6" value="true" />
74+
<add key="darc-int-dotnet-sdk-55a73a0-7" value="true" />
75+
<add key="darc-int-dotnet-sdk-55a73a0" value="true" />
7676
<!-- End: Package sources from dotnet-sdk -->
7777
<!-- Begin: Package sources from dotnet-windowsdesktop -->
7878
<add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="true" />
7979
<add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="true" />
8080
<add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="true" />
8181
<add key="darc-int-dotnet-windowsdesktop-0dad47b" value="true" />
8282
<!-- End: Package sources from dotnet-windowsdesktop -->
83-
<!-- End: Package sources from dotnet-runtime -->
8483
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
8584
</disabledPackageSources>
8685
</configuration>

eng/pipelines/templates/variables/vmr-build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ variables:
66
- name: centOSStreamContainer
77
value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
88
- name: fedoraContainer
9-
value: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-40
9+
value: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41
1010
- name: ubuntuContainer
1111
value: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
1212
- name: ubuntuArmContainer
@@ -19,7 +19,7 @@ variables:
1919
- name: centOSStreamName
2020
value: CentOSStream9
2121
- name: fedoraName
22-
value: Fedora40
22+
value: Fedora41
2323
- name: ubuntuName
2424
value: Ubuntu2204
2525

@@ -30,7 +30,7 @@ variables:
3030
- name: centOSStreamX64Rid
3131
value: centos.9-x64
3232
- name: fedoraX64Rid
33-
value: fedora.40-x64
33+
value: fedora.41-x64
3434
- name: ubuntux64Rid
3535
value: ubuntu.22.04-x64
3636
- name: ubuntuArm64Rid

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests;
1919
public class OmniSharpTests : SdkTests
2020
{
2121
// Update version as new releases become available: https://github.com/OmniSharp/omnisharp-roslyn/releases
22-
private const string OmniSharpReleaseVersion = "1.39.12";
22+
private const string OmniSharpReleaseVersion = "1.39.13";
2323

2424
private string OmniSharpDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), nameof(OmniSharpTests));
2525

0 commit comments

Comments
 (0)