Skip to content

Commit f7009d8

Browse files
author
Mirroring
committed
Merge commit '1f050ef85760592de3af01077d4649dd8be0d8e8'
2 parents 1f06f8d + 1f050ef commit f7009d8

File tree

6 files changed

+16
-20
lines changed

6 files changed

+16
-20
lines changed

NuGet.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-runtime -->
8-
<add key="darc-int-dotnet-runtime-9d5a6a9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9d5a6a9a/nuget/v3/index.json" />
98
<!-- End: Package sources from dotnet-runtime -->
109
<!-- Begin: Package sources from dotnet-winforms -->
11-
<add key="darc-int-dotnet-winforms-62ebdb4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-62ebdb4b/nuget/v3/index.json" />
1210
<!-- End: Package sources from dotnet-winforms -->
1311
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1412
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -24,10 +22,8 @@
2422
<disabledPackageSources>
2523
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2624
<!-- Begin: Package sources from dotnet-runtime -->
27-
<add key="darc-int-dotnet-runtime-9d5a6a9" value="true" />
2825
<!-- End: Package sources from dotnet-runtime -->
2926
<!-- Begin: Package sources from dotnet-winforms -->
30-
<add key="darc-int-dotnet-winforms-62ebdb4" value="true" />
3127
<!-- End: Package sources from dotnet-winforms -->
3228
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3329
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,25 +165,25 @@
165165
</Dependency>
166166
</ProductDependencies>
167167
<ToolsetDependencies>
168-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24509.3">
168+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24572.2">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
170+
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24509.3">
172+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24572.2">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
174+
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24509.3">
176+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24572.2">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
178+
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182182
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24509.3">
184+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24572.2">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
186+
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
187187
</Dependency>
188188
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
189189
<Uri>https://github.com/dotnet/sourcelink</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<!-- Packages that come from https://github.com/dotnet/arcade -->
5353
<PropertyGroup>
5454
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
55-
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24509.3</MicrosoftDotNetCodeAnalysisPackageVersion>
55+
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24572.2</MicrosoftDotNetCodeAnalysisPackageVersion>
5656
</PropertyGroup>
5757
<!-- Sourcelink -->
5858
<PropertyGroup>

eng/common/sdk-task.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.10.0-pre.4.0" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

eng/common/tools.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
383383

384384
# If the version of msbuild is going to be xcopied,
385385
# use this version. Version matches a package here:
386-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0
387-
$defaultXCopyMSBuildVersion = '17.10.0-pre.4.0'
386+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
387+
$defaultXCopyMSBuildVersion = '17.12.0'
388388

389389
if (!$vsRequirements) {
390390
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-rc.2.24474.11",
3+
"dotnet": "9.0.100",
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
@@ -12,11 +12,11 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2",
16-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24516.2"
15+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24572.2",
16+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24572.2"
1717
},
1818
"sdk": {
19-
"version": "9.0.100-rc.2.24474.11"
19+
"version": "9.0.100"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.38.0.1",

0 commit comments

Comments
 (0)