Skip to content

Commit d0ca5a8

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 37384: [internal/release/7.0] Merge from public
Merge from public release/7.0 to internal/release/7.0 and resolve conflicts if necessary
2 parents 96cbc87 + 751da91 commit d0ca5a8

File tree

5 files changed

+25
-13
lines changed

5 files changed

+25
-13
lines changed

Diff for: ‎NuGet.config

+12
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,15 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-efcore -->
77
<add key="darc-int-dotnet-efcore-c9d1c2d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-c9d1c2d2/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-efcore-819a61e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-819a61e6/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-efcore-819a61e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-819a61e6-2/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-efcore-819a61e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-819a61e6-1/nuget/v3/index.json" />
811
<!-- End: Package sources from dotnet-efcore -->
912
<!-- Begin: Package sources from dotnet-runtime -->
1013
<add key="darc-int-dotnet-runtime-dff486f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dff486f2/nuget/v3/index.json" />
14+
<add key="darc-int-dotnet-runtime-567edaf" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567edafe/nuget/v3/index.json" />
15+
<add key="darc-int-dotnet-runtime-567edaf-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567edafe-2/nuget/v3/index.json" />
16+
<add key="darc-int-dotnet-runtime-567edaf-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567edafe-1/nuget/v3/index.json" />
1117
<!-- End: Package sources from dotnet-runtime -->
1218
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1319
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -27,9 +33,15 @@
2733
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2834
<!-- Begin: Package sources from dotnet-efcore -->
2935
<add key="darc-int-dotnet-efcore-c9d1c2d" value="true" />
36+
<add key="darc-int-dotnet-efcore-819a61e-1" value="true" />
37+
<add key="darc-int-dotnet-efcore-819a61e-2" value="true" />
38+
<add key="darc-int-dotnet-efcore-819a61e" value="true" />
3039
<!-- End: Package sources from dotnet-efcore -->
3140
<!-- Begin: Package sources from dotnet-runtime -->
3241
<add key="darc-int-dotnet-runtime-dff486f" value="true" />
42+
<add key="darc-int-dotnet-runtime-567edaf-1" value="true" />
43+
<add key="darc-int-dotnet-runtime-567edaf-2" value="true" />
44+
<add key="darc-int-dotnet-runtime-567edaf" value="true" />
3345
<!-- End: Package sources from dotnet-runtime -->
3446
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3547
</disabledPackageSources>

Diff for: ‎eng/Version.Details.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -302,22 +302,22 @@
302302
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
303303
<Sha>8587d13a2764c025277d628471984bae8e16427c</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24059.5">
305+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24114.4">
306306
<Uri>https://github.com/dotnet/arcade</Uri>
307-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
307+
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
308308
<SourceBuild RepoName="arcade" ManagedOnly="true" />
309309
</Dependency>
310-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24059.5">
310+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24114.4">
311311
<Uri>https://github.com/dotnet/arcade</Uri>
312-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
312+
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
313313
</Dependency>
314-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.24059.5">
314+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.24114.4">
315315
<Uri>https://github.com/dotnet/arcade</Uri>
316-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
316+
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
317317
</Dependency>
318-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24059.5">
318+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24114.4">
319319
<Uri>https://github.com/dotnet/arcade</Uri>
320-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
320+
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
321321
</Dependency>
322322
</ToolsetDependencies>
323323
</Dependencies>

Diff for: ‎eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@
134134
<MicrosoftEntityFrameworkCoreVersion>7.0.17</MicrosoftEntityFrameworkCoreVersion>
135135
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.17</MicrosoftEntityFrameworkCoreDesignVersion>
136136
<!-- Packages from dotnet/arcade -->
137-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksInstallersVersion>
138-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksTemplatingVersion>
137+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksInstallersVersion>
138+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksTemplatingVersion>
139139
<!-- Packages from dotnet/source-build-externals -->
140140
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.24059.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
141141
<!-- Packages from dotnet/xdt -->

Diff for: ‎eng/common/native/init-compiler.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
7171
# Set default versions
7272
if [[ -z "$majorVersion" ]]; then
7373
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
74-
if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
74+
if [[ "$compiler" == "clang" ]]; then versions=( 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
7575
elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
7676

7777
for version in "${versions[@]}"; do

Diff for: ‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.19",
30-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5",
31-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24059.5"
30+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4",
31+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24114.4"
3232
}
3333
}

0 commit comments

Comments
 (0)