Skip to content

Commit

Permalink
Merge pull request #62972 from dotnet/darc-main-0bc6b216-1f46-4f63-bf…
Browse files Browse the repository at this point in the history
…1c-219958c28002

[main] Update dependencies from dotnet/arcade
  • Loading branch information
JoeRobich committed Jul 27, 2022
2 parents 6f85d60 + ad9928e commit ff70eb2
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 7 deletions.
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22375.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22376.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5d3e421833a18b48eed5bda24f4d5f65a75cf970</Sha>
<Sha>37e6d5179448c5255f1517834463210dcc45963a</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.1.0-5.22128.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22375.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22376.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5d3e421833a18b48eed5bda24f4d5f65a75cf970</Sha>
<Sha>37e6d5179448c5255f1517834463210dcc45963a</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
17 changes: 16 additions & 1 deletion eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ usage()
echo "Actions:"
echo " --restore Restore dependencies (short: -r)"
echo " --build Build solution (short: -b)"
echo " --source-build Source-build the solution (short: -sb)"
echo " Will additionally trigger the following actions: --restore, --build, --pack"
echo " If --configuration is not set explicitly, will also set it to 'Release'"
echo " --rebuild Rebuild solution"
echo " --test Run all unit tests in the solution (short: -t)"
echo " --integrationTest Run all integration tests in the solution"
Expand Down Expand Up @@ -55,6 +58,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"

restore=false
build=false
source_build=false
rebuild=false
test=false
integration_test=false
Expand All @@ -73,7 +77,7 @@ exclude_ci_binary_log=false
pipelines_log=false

projects=''
configuration='Debug'
configuration=''
prepare_machine=false
verbosity='minimal'
runtime_source_feed=''
Expand Down Expand Up @@ -119,6 +123,12 @@ while [[ $# > 0 ]]; do
-pack)
pack=true
;;
-sourcebuild|-sb)
build=true
source_build=true
restore=true
pack=true
;;
-test|-t)
test=true
;;
Expand Down Expand Up @@ -168,6 +178,10 @@ while [[ $# > 0 ]]; do
shift
done

if [[ -z "$configuration" ]]; then
if [[ "$source_build" = true ]]; then configuration="Release"; else configuration="Debug"; fi
fi

if [[ "$ci" == true ]]; then
pipelines_log=true
node_reuse=false
Expand Down Expand Up @@ -205,6 +219,7 @@ function Build {
/p:RepoRoot="$repo_root" \
/p:Restore=$restore \
/p:Build=$build \
/p:ArcadeBuildFromSource=$source_build \
/p:Rebuild=$rebuild \
/p:Test=$test \
/p:Pack=$pack \
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"xcopy-msbuild": "17.1.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22375.4",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22375.4"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22376.3",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22376.3"
}
}

0 comments on commit ff70eb2

Please sign in to comment.