Skip to content

Commit f80b8d4

Browse files
captainsafiacaptainsafia
authored
Merge branch 'main' into darc-main-fabfd75e-c692-40bb-be75-da9473a50bab
2 parents 5d01282 + f44b5dc commit f80b8d4

File tree

4 files changed

+41
-28
lines changed

4 files changed

+41
-28
lines changed

‎eng/Version.Details.xml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.4.23180.2" CoherentParentDependency="Microsoft.NET.Sdk">
6464
<Uri>https://github.com/dotnet/aspnetcore</Uri>
6565
<Sha>83728cac8c2feb5b81f2402c3d83c32f9239c22c</Sha>
66-
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
66+
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
6767
</Dependency>
6868
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.4.23180.2" CoherentParentDependency="Microsoft.NET.Sdk">
6969
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -154,7 +154,7 @@
154154
<Dependency Name="Microsoft.Build" Version="17.6.0-preview-23174-01" CoherentParentDependency="Microsoft.NET.Sdk">
155155
<Uri>https://github.com/dotnet/msbuild</Uri>
156156
<Sha>e7de1330724224a542668e1ef82c997613c7080c</Sha>
157-
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
157+
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
158158
</Dependency>
159159
<Dependency Name="NuGet.Build.Tasks" Version="6.6.0-preview.3.58" CoherentParentDependency="Microsoft.NET.Sdk">
160160
<Uri>https://github.com/nuget/nuget.client</Uri>
@@ -181,30 +181,30 @@
181181
<Sha>b60c95e1ce736630d17e16626c59e3dd85ebae2b</Sha>
182182
<SourceBuild RepoName="deployment-tools" ManagedOnly="true" />
183183
</Dependency>
184-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23171.1">
184+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23178.2">
185185
<Uri>https://github.com/dotnet/source-build-externals</Uri>
186-
<Sha>4b8fe3ff0cfb2b38901803c798c647ca8123c222</Sha>
186+
<Sha>cbd9d61c5a92d7e4a0548a2c8ff4d1a28aaf6379</Sha>
187187
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
188188
</Dependency>
189-
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="1.4.0-beta2-21475-02">
189+
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.0.0-beta-22503-02">
190190
<Uri>https://github.com/dotnet/symreader</Uri>
191-
<Sha>7b9791daa3a3477eb22ec805946c9fff8b42d8ca</Sha>
191+
<Sha>0c29b7109c054bdc578e917515ae7e8635b9cb9d</Sha>
192192
<SourceBuild RepoName="symreader" ManagedOnly="true" />
193193
</Dependency>
194194
</ProductDependencies>
195195
<ToolsetDependencies>
196-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23174.1">
196+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23177.4">
197197
<Uri>https://github.com/dotnet/arcade</Uri>
198-
<Sha>1177b37e60c7271ab461098aefbdd03edc15b90d</Sha>
198+
<Sha>747f53d751983dd062f39f4654bff074536e0012</Sha>
199199
<SourceBuild RepoName="arcade" ManagedOnly="true" />
200200
</Dependency>
201-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23174.1">
201+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23177.4">
202202
<Uri>https://github.com/dotnet/arcade</Uri>
203-
<Sha>1177b37e60c7271ab461098aefbdd03edc15b90d</Sha>
203+
<Sha>747f53d751983dd062f39f4654bff074536e0012</Sha>
204204
</Dependency>
205-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23174.1">
205+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23177.4">
206206
<Uri>https://github.com/dotnet/arcade</Uri>
207-
<Sha>1177b37e60c7271ab461098aefbdd03edc15b90d</Sha>
207+
<Sha>747f53d751983dd062f39f4654bff074536e0012</Sha>
208208
</Dependency>
209209
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23128.1">
210210
<Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -218,19 +218,19 @@
218218
<Uri>https://github.com/dotnet/runtime</Uri>
219219
<Sha>af841c8b33cecc92d74222298f1e45bf7bf3d90a</Sha>
220220
</Dependency>
221-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23178.5">
221+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23179.1">
222222
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
223-
<Sha>60137c7c084e98ce5ab35473f9a5302b0a988d01</Sha>
224-
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
223+
<Sha>bc5210a7b68c43bcf9d9687b9268a4665126c583</Sha>
224+
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
225225
</Dependency>
226-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-23172-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
226+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-23175-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
227227
<Uri>https://github.com/dotnet/sourcelink</Uri>
228-
<Sha>a86ac5afc76f4afbd3dd59029a00857cc3eeb6e3</Sha>
228+
<Sha>ccfca8dce5f7525433756281c2c275386348a9ad</Sha>
229229
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
230230
</Dependency>
231-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23172.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
231+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23175.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
232232
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
233-
<Sha>f2ad3b152aac2a3f1c620178e9004b1f84ccfd1d</Sha>
233+
<Sha>f8afbbadc5b87ae70b8993f4a9cfa54fb820d6ce</Sha>
234234
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
235235
</Dependency>
236236
</ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</PropertyGroup>
3434
<PropertyGroup>
3535
<!-- Dependency from https://github.com/dotnet/arcade -->
36-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23174.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
36+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23177.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
3737
</PropertyGroup>
3838
<PropertyGroup>
3939
<!-- Dependency from https://github.com/dotnet/arcade-services -->

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"cmake": "3.21.0"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23174.1",
15-
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23174.1"
14+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23177.4",
15+
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23177.4"
1616
}
1717
}

‎src/SourceBuild/content/prep.sh‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,22 @@ usage() {
1010
echo " Prepares the environment to be built by downloading Private.SourceBuilt.Artifacts.*.tar.gz and"
1111
echo " installing the version of dotnet referenced in global.json"
1212
echo "options:"
13-
echo " --no-artifacts Exclude the download of the previously source-built artifacts archive."
14-
echo " --no-bootstrap Don't replace portable packages in the download source-built artifacts"
15-
echo " --no-prebuilts Exclude the download of the prebuilts archive."
16-
echo " --no-sdk Exclude the download of the .NET SDK."
13+
echo " --no-artifacts Exclude the download of the previously source-built artifacts archive."
14+
echo " --no-bootstrap Don't replace portable packages in the download source-built artifacts"
15+
echo " --no-prebuilts Exclude the download of the prebuilts archive."
16+
echo " --no-sdk Exclude the download of the .NET SDK."
17+
echo " --runtime-source-feed URL of a remote server or a local directory, from which SDKs and"
18+
echo " runtimes can be downloaded"
19+
echo " --runtime-source-feed-key Key for accessing the above server, if necessary"
1720
echo ""
1821
}
1922

2023
buildBootstrap=true
2124
downloadArtifacts=true
2225
downloadPrebuilts=true
2326
installDotnet=true
27+
runtime_source_feed=''
28+
runtime_source_feed_key=''
2429
positional_args=()
2530
while :; do
2631
if [ $# -le 0 ]; then
@@ -44,6 +49,14 @@ while :; do
4449
--no-sdk)
4550
installDotnet=false
4651
;;
52+
--runtime-source-feed)
53+
runtime_source_feed=$2
54+
shift
55+
;;
56+
--runtime-source-feed-key)
57+
runtime_source_feed_key=$2
58+
shift
59+
;;
4760
*)
4861
positional_args+=("$1")
4962
;;
@@ -69,14 +82,14 @@ fi
6982
# Check if Private.SourceBuilt artifacts archive exists
7083
artifactsBaseFileName="Private.SourceBuilt.Artifacts"
7184
packagesArchiveDir="$SCRIPT_ROOT/prereqs/packages/archive/"
72-
if [[ "$downloadArtifacts" == "true" && -f ${packagesArchiveDir}${artifactsBaseFileName}.*.tar.gz ]]; then
85+
if [ "$downloadArtifacts" == "true" ] && [ -f ${packagesArchiveDir}${artifactsBaseFileName}.*.tar.gz ]; then
7386
echo " Private.SourceBuilt.Artifacts.*.tar.gz exists...it will not be downloaded"
7487
downloadArtifacts=false
7588
fi
7689

7790
# Check if Private.SourceBuilt prebuilts archive exists
7891
prebuiltsBaseFileName="Private.SourceBuilt.Prebuilts"
79-
if [[ "$downloadPrebuilts" == "true" && -f ${packagesArchiveDir}${prebuiltsBaseFileName}.*.tar.gz ]]; then
92+
if [ "$downloadPrebuilts" == "true" ] && [ -f ${packagesArchiveDir}${prebuiltsBaseFileName}.*.tar.gz ]; then
8093
echo " Private.SourceBuilt.Prebuilts.*.tar.gz exists...it will not be downloaded"
8194
downloadPrebuilts=false
8295
fi

0 commit comments

Comments
 (0)