Skip to content

Commit d558267

Browse files
author
Mirroring
committed
Merge commit 'c311a6d329af16b3fc068eca9dd40b27041f93a2'
2 parents 75e90fb + c311a6d commit d558267

File tree

5 files changed

+52
-56
lines changed

5 files changed

+52
-56
lines changed

‎NuGet.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-deployment-tools -->
77
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-4/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-3/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-2/nuget/v3/index.json" />
811
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-9/nuget/v3/index.json" />
912
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-8/nuget/v3/index.json" />
1013
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-7/nuget/v3/index.json" />
@@ -39,6 +42,9 @@
3942
<!-- End: Package sources from dotnet-runtime -->
4043
<!-- Begin: Package sources from dotnet-templating -->
4144
<add key="darc-pub-dotnet-templating-f46c70a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab/nuget/v3/index.json" />
45+
<add key="darc-pub-dotnet-templating-f46c70a-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-4/nuget/v3/index.json" />
46+
<add key="darc-pub-dotnet-templating-f46c70a-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-3/nuget/v3/index.json" />
47+
<add key="darc-pub-dotnet-templating-f46c70a-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-2/nuget/v3/index.json" />
4248
<add key="darc-pub-dotnet-templating-f46c70a-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-9/nuget/v3/index.json" />
4349
<add key="darc-pub-dotnet-templating-f46c70a-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-8/nuget/v3/index.json" />
4450
<add key="darc-pub-dotnet-templating-f46c70a-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-7/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -97,43 +97,43 @@
9797
<Sha>fd29258f2eb7502b09a450a8250495adb6c5caee</Sha>
9898
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9999
</Dependency>
100-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.24631.1">
100+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.25076.6">
101101
<Uri>https://github.com/dotnet/roslyn</Uri>
102-
<Sha>da7c6c4257b2f661024b9a506773372a09023eee</Sha>
102+
<Sha>449a6208fa043f61558b00d0d1c4738c6bedf2ee</Sha>
103103
</Dependency>
104104
<!-- Intermediate is necessary for source build. -->
105-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.24631.1">
105+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.25076.6">
106106
<Uri>https://github.com/dotnet/roslyn</Uri>
107-
<Sha>da7c6c4257b2f661024b9a506773372a09023eee</Sha>
107+
<Sha>449a6208fa043f61558b00d0d1c4738c6bedf2ee</Sha>
108108
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
109109
</Dependency>
110-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.24631.1">
110+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.25076.6">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>da7c6c4257b2f661024b9a506773372a09023eee</Sha>
112+
<Sha>449a6208fa043f61558b00d0d1c4738c6bedf2ee</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.24631.1">
114+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.25076.6">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>da7c6c4257b2f661024b9a506773372a09023eee</Sha>
116+
<Sha>449a6208fa043f61558b00d0d1c4738c6bedf2ee</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.24631.1">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.25076.6">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>da7c6c4257b2f661024b9a506773372a09023eee</Sha>
120+
<Sha>449a6208fa043f61558b00d0d1c4738c6bedf2ee</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.24631.1">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.25076.6">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>da7c6c4257b2f661024b9a506773372a09023eee</Sha>
124+
<Sha>449a6208fa043f61558b00d0d1c4738c6bedf2ee</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.24631.1">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.25076.6">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>da7c6c4257b2f661024b9a506773372a09023eee</Sha>
128+
<Sha>449a6208fa043f61558b00d0d1c4738c6bedf2ee</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.24631.1">
130+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.25076.6">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>da7c6c4257b2f661024b9a506773372a09023eee</Sha>
132+
<Sha>449a6208fa043f61558b00d0d1c4738c6bedf2ee</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.24631.1">
134+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.25076.6">
135135
<Uri>https://github.com/dotnet/roslyn</Uri>
136-
<Sha>da7c6c4257b2f661024b9a506773372a09023eee</Sha>
136+
<Sha>449a6208fa043f61558b00d0d1c4738c6bedf2ee</Sha>
137137
</Dependency>
138138
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.2-rtm.25067.4">
139139
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
@@ -589,34 +589,34 @@
589589
</Dependency>
590590
</ProductDependencies>
591591
<ToolsetDependencies>
592-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25065.2">
592+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25077.4">
593593
<Uri>https://github.com/dotnet/arcade</Uri>
594-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
594+
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25065.2">
596+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25077.4">
597597
<Uri>https://github.com/dotnet/arcade</Uri>
598-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
598+
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25065.2">
600+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25077.4">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
602+
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25065.2">
604+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25077.4">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
606+
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25065.2">
608+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25077.4">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
610+
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25065.2">
612+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25077.4">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
614+
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
615615
</Dependency>
616616
<!-- Intermediate is necessary for source build. -->
617-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25065.2">
617+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25077.4">
618618
<Uri>https://github.com/dotnet/arcade</Uri>
619-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
619+
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
620620
<SourceBuild RepoName="arcade" ManagedOnly="true" />
621621
</Dependency>
622622
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.2">

‎eng/Versions.props

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -204,14 +204,14 @@
204204
</PropertyGroup>
205205
<PropertyGroup>
206206
<!-- Dependencies from https://github.com/dotnet/roslyn -->
207-
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.24631.1</MicrosoftNetCompilersToolsetVersion>
208-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.24631.1</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
209-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.24631.1</MicrosoftCodeAnalysisPackageVersion>
210-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.24631.1</MicrosoftCodeAnalysisCSharpPackageVersion>
211-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.24631.1</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
212-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.24631.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
213-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.24631.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
214-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.24631.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
207+
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25076.6</MicrosoftNetCompilersToolsetVersion>
208+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.25076.6</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
209+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.25076.6</MicrosoftCodeAnalysisPackageVersion>
210+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.25076.6</MicrosoftCodeAnalysisCSharpPackageVersion>
211+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.25076.6</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
212+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.25076.6</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
213+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.25076.6</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
214+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.25076.6</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
215215
</PropertyGroup>
216216
<PropertyGroup>
217217
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -270,10 +270,10 @@
270270
</PropertyGroup>
271271
<PropertyGroup>
272272
<!-- Dependencies from https://github.com/dotnet/arcade -->
273-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25065.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25065.2</MicrosoftDotNetSignToolVersion>
275-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25065.2</MicrosoftDotNetXliffTasksVersion>
276-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25065.2</MicrosoftDotNetXUnitExtensionsVersion>
273+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25077.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25077.4</MicrosoftDotNetSignToolVersion>
275+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25077.4</MicrosoftDotNetXliffTasksVersion>
276+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25077.4</MicrosoftDotNetXUnitExtensionsVersion>
277277
</PropertyGroup>
278278
<PropertyGroup>
279279
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎eng/common/internal/Tools.csproj

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,6 @@
1515
<PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
1616
<PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
1717
</ItemGroup>
18-
<PropertyGroup>
19-
<RestoreSources></RestoreSources>
20-
<RestoreSources Condition="'$(UsingToolIbcOptimization)' == 'true'">
21-
https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json;
22-
</RestoreSources>
23-
<RestoreSources Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'">
24-
$(RestoreSources);
25-
https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json;
26-
</RestoreSources>
27-
</PropertyGroup>
2818

2919
<!-- Repository extensibility point -->
3020
<Import Project="$(RepositoryEngineeringDir)InternalTools.props" Condition="Exists('$(RepositoryEngineeringDir)InternalTools.props')" />

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25065.2",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25077.4",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25077.4",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)