Get update-dependenices working again
- Fix build issues due to .props file not existing on a clean enlistment - Fix path separator issues on *NIX - Add update-dependencies.sh - Support -Update in update-dependencies.ps1
This commit is contained in:
parent
a101c703a1
commit
5d932c6aba
3 changed files with 80 additions and 4 deletions
|
@ -62,7 +62,7 @@ namespace Microsoft.DotNet.Scripts
|
||||||
|
|
||||||
private static IEnumerable<IDependencyUpdater> GetUpdaters()
|
private static IEnumerable<IDependencyUpdater> GetUpdaters()
|
||||||
{
|
{
|
||||||
yield return CreateRegexUpdater(@"build\Microsoft.DotNet.Cli.DependencyVersions.props", "CLI_SharedFrameworkVersion", "Microsoft.NETCore.App");
|
yield return CreateRegexUpdater(Path.Combine("build", "Microsoft.DotNet.Cli.DependencyVersions.props"), "CLI_SharedFrameworkVersion", "Microsoft.NETCore.App");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static IDependencyUpdater CreateRegexUpdater(string repoRelativePath, string propertyName, string packageId)
|
private static IDependencyUpdater CreateRegexUpdater(string repoRelativePath, string propertyName, string packageId)
|
||||||
|
|
|
@ -4,14 +4,16 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
param(
|
param(
|
||||||
[switch]$Help)
|
[switch]$Help,
|
||||||
|
[switch]$Update)
|
||||||
|
|
||||||
if($Help)
|
if($Help)
|
||||||
{
|
{
|
||||||
Write-Host "Usage: .\update-dependencies.ps1"
|
Write-Host "Usage: .\update-dependencies.ps1"
|
||||||
Write-Host ""
|
Write-Host ""
|
||||||
Write-Host "Options:"
|
Write-Host "Options:"
|
||||||
Write-Host " -Help Display this help message"
|
Write-Host " -Help Display this help message"
|
||||||
|
Write-Host " -Update Update dependencies (but don't open a PR)"
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -19,6 +21,12 @@ $Architecture='x64'
|
||||||
|
|
||||||
$RepoRoot = "$PSScriptRoot\..\.."
|
$RepoRoot = "$PSScriptRoot\..\.."
|
||||||
$ProjectPath = "$PSScriptRoot\update-dependencies.csproj"
|
$ProjectPath = "$PSScriptRoot\update-dependencies.csproj"
|
||||||
|
$ProjectArgs = ""
|
||||||
|
|
||||||
|
if ($Update)
|
||||||
|
{
|
||||||
|
$ProjectArgs = "--Update"
|
||||||
|
}
|
||||||
|
|
||||||
# Use a repo-local install directory (but not the artifacts directory because that gets cleaned a lot
|
# Use a repo-local install directory (but not the artifacts directory because that gets cleaned a lot
|
||||||
if (!$env:DOTNET_INSTALL_DIR)
|
if (!$env:DOTNET_INSTALL_DIR)
|
||||||
|
@ -34,6 +42,11 @@ if($LASTEXITCODE -ne 0) { throw "Failed to install stage0" }
|
||||||
# Put the stage0 on the path
|
# Put the stage0 on the path
|
||||||
$env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH"
|
$env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH"
|
||||||
|
|
||||||
|
# Generate some props files that are imported by update-dependencies
|
||||||
|
Write-Host "Generating property files..."
|
||||||
|
dotnet msbuild $RepoRoot\build.proj /p:Architecture=$Architecture /p:GeneratingPropsFile=true /t:WriteDynamicPropsToStaticPropsFiles
|
||||||
|
if($LASTEXITCODE -ne 0) { throw "Failed to generate intermidates" }
|
||||||
|
|
||||||
# Restore the app
|
# Restore the app
|
||||||
Write-Host "Restoring $ProjectPath..."
|
Write-Host "Restoring $ProjectPath..."
|
||||||
dotnet restore "$ProjectPath"
|
dotnet restore "$ProjectPath"
|
||||||
|
@ -41,5 +54,5 @@ if($LASTEXITCODE -ne 0) { throw "Failed to restore" }
|
||||||
|
|
||||||
# Run the app
|
# Run the app
|
||||||
Write-Host "Invoking App $ProjectPath..."
|
Write-Host "Invoking App $ProjectPath..."
|
||||||
dotnet run -p "$ProjectPath"
|
dotnet run -p "$ProjectPath" "$ProjectArgs"
|
||||||
if($LASTEXITCODE -ne 0) { throw "Build failed" }
|
if($LASTEXITCODE -ne 0) { throw "Build failed" }
|
||||||
|
|
63
build_projects/update-dependencies/update-dependencies.sh
Executable file
63
build_projects/update-dependencies/update-dependencies.sh
Executable file
|
@ -0,0 +1,63 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
#
|
||||||
|
# Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||||
|
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||||
|
#
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
SOURCE="${BASH_SOURCE[0]}"
|
||||||
|
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
|
||||||
|
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
||||||
|
SOURCE="$(readlink "$SOURCE")"
|
||||||
|
[[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
|
||||||
|
done
|
||||||
|
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
||||||
|
|
||||||
|
REPO_ROOT="$DIR/../.."
|
||||||
|
PROJECT_PATH="$DIR/update-dependencies.csproj"
|
||||||
|
|
||||||
|
# Some things depend on HOME and it may not be set. We should fix those things, but until then, we just patch a value in
|
||||||
|
if [ -z "${HOME:-}" ]; then
|
||||||
|
export HOME=$REPO_ROOT/artifacts/home
|
||||||
|
|
||||||
|
[ ! -d "$HOME" ] || rm -Rf "$HOME"
|
||||||
|
mkdir -p "$HOME"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Use a repo-local install directory (but not the artifacts directory because that gets cleaned a lot)
|
||||||
|
if [ -z "${DOTNET_INSTALL_DIR:-}" ]; then
|
||||||
|
export DOTNET_INSTALL_DIR=$REPO_ROOT/.dotnet_stage0/x64
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Install a stage 0
|
||||||
|
echo "Installing .NET Core CLI Stage 0"
|
||||||
|
$REPO_ROOT/scripts/obtain/dotnet-install.sh -Channel master -Architecture x64
|
||||||
|
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "Failed to install stage 0"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Put the stage 0 on the path
|
||||||
|
export PATH=$DOTNET_INSTALL_DIR:$PATH
|
||||||
|
|
||||||
|
# Generate some props files that are imported by update-dependencies
|
||||||
|
echo "Generating property files..."
|
||||||
|
dotnet msbuild "$REPO_ROOT/build.proj" /p:Architecture=x64 /p:GeneratingPropsFile=true /t:WriteDynamicPropsToStaticPropsFiles
|
||||||
|
|
||||||
|
echo "Resotring $PROJECT_PATH..."
|
||||||
|
dotnet restore "$PROJECT_PATH"
|
||||||
|
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "Failed to restore"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Invoking App $PROJECT_PATH..."
|
||||||
|
dotnet run -p "$PROJECT_PATH" $@
|
||||||
|
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "Build failed"
|
||||||
|
exit 1
|
||||||
|
fi
|
Loading…
Add table
Add a link
Reference in a new issue