mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into darc-main-fabfd75e-c692-40bb-be75-da9473a50bab

Browse source
This commit is contained in:
Safia Abdalla 2023-03-30 17:08:33 -07:00 committed by GitHub
commit f80b8d43fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 41 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
eng/Version.Details.xml
View file

@ -63,7 +63,7 @@
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.4.23180.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>83728cac8c2feb5b81f2402c3d83c32f9239c22c</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.4.23180.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@ -154,7 +154,7 @@
<Dependency Name="Microsoft.Build" Version="17.6.0-preview-23174-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>e7de1330724224a542668e1ef82c997613c7080c</Sha>
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.6.0-preview.3.58" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/nuget/nuget.client</Uri>
@ -181,30 +181,30 @@
<Sha>b60c95e1ce736630d17e16626c59e3dd85ebae2b</Sha>
<SourceBuild RepoName="deployment-tools" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23171.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23178.2">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>4b8fe3ff0cfb2b38901803c798c647ca8123c222</Sha>
<Sha>cbd9d61c5a92d7e4a0548a2c8ff4d1a28aaf6379</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="1.4.0-beta2-21475-02">
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.0.0-beta-22503-02">
<Uri>https://github.com/dotnet/symreader</Uri>
<Sha>7b9791daa3a3477eb22ec805946c9fff8b42d8ca</Sha>
<Sha>0c29b7109c054bdc578e917515ae7e8635b9cb9d</Sha>
<SourceBuild RepoName="symreader" ManagedOnly="true" />
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23174.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23177.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1177b37e60c7271ab461098aefbdd03edc15b90d</Sha>
<Sha>747f53d751983dd062f39f4654bff074536e0012</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23174.1">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23177.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1177b37e60c7271ab461098aefbdd03edc15b90d</Sha>
<Sha>747f53d751983dd062f39f4654bff074536e0012</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23174.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23177.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1177b37e60c7271ab461098aefbdd03edc15b90d</Sha>
<Sha>747f53d751983dd062f39f4654bff074536e0012</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23128.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
@ -218,19 +218,19 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>af841c8b33cecc92d74222298f1e45bf7bf3d90a</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23178.5">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23179.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>60137c7c084e98ce5ab35473f9a5302b0a988d01</Sha>
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
<Sha>bc5210a7b68c43bcf9d9687b9268a4665126c583</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-23172-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-23175-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>a86ac5afc76f4afbd3dd59029a00857cc3eeb6e3</Sha>
<Sha>ccfca8dce5f7525433756281c2c275386348a9ad</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23172.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23175.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>f2ad3b152aac2a3f1c620178e9004b1f84ccfd1d</Sha>
<Sha>f8afbbadc5b87ae70b8993f4a9cfa54fb820d6ce</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>

2
eng/Versions.props
View file

@ -33,7 +33,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23174.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23177.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23174.1",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23174.1"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23177.4",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23177.4"
}
}

17
src/SourceBuild/content/prep.sh
View file

@ -14,6 +14,9 @@ usage() {
echo " --no-bootstrap Don't replace portable packages in the download source-built artifacts"
echo " --no-prebuilts Exclude the download of the prebuilts archive."
echo " --no-sdk Exclude the download of the .NET SDK."
echo " --runtime-source-feed URL of a remote server or a local directory, from which SDKs and"
echo " runtimes can be downloaded"
echo " --runtime-source-feed-key Key for accessing the above server, if necessary"
echo ""
}
@ -21,6 +24,8 @@ buildBootstrap=true
downloadArtifacts=true
downloadPrebuilts=true
installDotnet=true
runtime_source_feed=''
runtime_source_feed_key=''
positional_args=()
while :; do
if [ $# -le 0 ]; then
@ -44,6 +49,14 @@ while :; do
--no-sdk)
installDotnet=false
;;
--runtime-source-feed)
runtime_source_feed=$2
shift
;;
--runtime-source-feed-key)
runtime_source_feed_key=$2
shift
;;
*)
positional_args+=("$1")
;;
@ -69,14 +82,14 @@ fi
# Check if Private.SourceBuilt artifacts archive exists
artifactsBaseFileName="Private.SourceBuilt.Artifacts"
packagesArchiveDir="$SCRIPT_ROOT/prereqs/packages/archive/"
if [[ "$downloadArtifacts" == "true" && -f ${packagesArchiveDir}${artifactsBaseFileName}.*.tar.gz ]]; then
if [ "$downloadArtifacts" == "true" ] && [ -f ${packagesArchiveDir}${artifactsBaseFileName}.*.tar.gz ]; then
echo " Private.SourceBuilt.Artifacts.*.tar.gz exists...it will not be downloaded"
downloadArtifacts=false
fi
# Check if Private.SourceBuilt prebuilts archive exists
prebuiltsBaseFileName="Private.SourceBuilt.Prebuilts"
if [[ "$downloadPrebuilts" == "true" && -f ${packagesArchiveDir}${prebuiltsBaseFileName}.*.tar.gz ]]; then
if [ "$downloadPrebuilts" == "true" ] && [ -f ${packagesArchiveDir}${prebuiltsBaseFileName}.*.tar.gz ]; then
echo " Private.SourceBuilt.Prebuilts.*.tar.gz exists...it will not be downloaded"
downloadPrebuilts=false
fi