Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update included build tools to closely match NET 6 Preview 1 SDK #2103

Merged
merged 1 commit into from
Mar 2, 2021
Merged

Update included build tools to closely match NET 6 Preview 1 SDK #2103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
<add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
<add key="OmniSharp" value="https://www.myget.org/F/omnisharp/api/v3/index.json" />
</packageSources>
</configuration>
10 changes: 5 additions & 5 deletions scripts/cake-bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

# Define directories.
SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
TOOLS_DIR=$SCRIPT_DIR/tools
TOOLS_DIR=$SCRIPT_DIR/../tools
NUGET_EXE=$TOOLS_DIR/nuget.exe
CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe
PACKAGES_CONFIG=$TOOLS_DIR/packages.config
Expand All @@ -26,7 +26,7 @@ fi
SCRIPT="build.cake"
TARGET="Default"
CONFIGURATION="Release"
VERBOSITY="verbose"
VERBOSITY="Verbose"
DRYRUN=
SHOW_VERSION=false
SCRIPT_ARGUMENTS=()
Expand Down Expand Up @@ -73,7 +73,7 @@ fi

# Restore tools from NuGet.
pushd "$TOOLS_DIR" >/dev/null
if [ ! -f $PACKAGES_CONFIG_MD5 ] || [ "$( cat $PACKAGES_CONFIG_MD5 | sed 's/\r$//' )" != "$( $MD5_EXE $PACKAGES_CONFIG | awk '{ print $1 }' )" ]; then
if [ ! -f "$PACKAGES_CONFIG_MD5" ] || [ "$( cat "$PACKAGES_CONFIG_MD5" | sed 's/\r$//' )" != "$( $MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' )" ]; then
find . -type d ! -name . | xargs rm -rf
fi

Expand All @@ -83,7 +83,7 @@ if [ $? -ne 0 ]; then
exit 1
fi

$MD5_EXE $PACKAGES_CONFIG | awk '{ print $1 }' >| $PACKAGES_CONFIG_MD5
$MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' >| "$PACKAGES_CONFIG_MD5"

popd >/dev/null

Expand All @@ -95,7 +95,7 @@ fi

# Start Cake
if $SHOW_VERSION; then
exec mono "$CAKE_EXE" -version
exec mono "$CAKE_EXE" --version
else
exec mono "$CAKE_EXE" $SCRIPT --verbosity=$VERBOSITY --configuration=$CONFIGURATION --target=$TARGET $DRYRUN "${SCRIPT_ARGUMENTS[@]}"
fi
54 changes: 27 additions & 27 deletions tools/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,44 @@
<packages>
<package id="Cake" version="1.0.0-rc0001" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.1" />
<package id="Microsoft.Build" version="16.8.0" />
<package id="Microsoft.Build.Framework" version="16.8.0" />
<package id="Microsoft.Build.Runtime" version="16.8.0" />
<package id="Microsoft.Build.Tasks.Core" version="16.8.0" />
<package id="Microsoft.Build.Utilities.Core" version="16.8.0" />
<package id="Microsoft.Net.Compilers.Toolset" version="3.8.0" />
<package id="Microsoft.DotNet.MSBuildSdkResolver" version="5.0.101-servicing.20564.2" />
<package id="Microsoft.Build.NuGetSdkResolver" version="5.8.0-rc.6930" />
<package id="Microsoft.Build" version="16.9.0" />
<package id="Microsoft.Build.Framework" version="16.9.0" />
<package id="Microsoft.Build.Runtime" version="16.9.0" />
<package id="Microsoft.Build.Tasks.Core" version="16.9.0" />
<package id="Microsoft.Build.Utilities.Core" version="16.9.0" />
<package id="Microsoft.Net.Compilers.Toolset" version="3.9.0-6.21124.20" />
<package id="Microsoft.DotNet.MSBuildSdkResolver" version="6.0.100-preview.1.21109.12" />
<package id="Microsoft.Build.NuGetSdkResolver" version="5.9.0-rc.7121" />
<package id="Newtonsoft.Json" version="12.0.2" />
<package id="NuGet.Build.Tasks" version="5.8.0-rc.6930" />
<package id="NuGet.Commands" version="5.8.0-rc.6930" />
<package id="NuGet.Common" version="5.8.0-rc.6930" />
<package id="NuGet.Configuration" version="5.8.0-rc.6930" />
<package id="NuGet.Credentials" version="5.8.0-rc.6930" />
<package id="NuGet.DependencyResolver.Core" version="5.8.0-rc.6930" />
<package id="NuGet.Frameworks" version="5.8.0-rc.6930" />
<package id="NuGet.LibraryModel" version="5.8.0-rc.6930" />
<package id="NuGet.Packaging" version="5.8.0-rc.6930" />
<package id="NuGet.ProjectModel" version="5.8.0-rc.6930" />
<package id="NuGet.Protocol" version="5.8.0-rc.6930" />
<package id="NuGet.Versioning" version="5.8.0-rc.6930" />
<package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="5.0.0" />
<package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="5.0.0" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="5.0.0" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="5.0.0" />
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="5.0.0" />
<package id="NuGet.Build.Tasks" version="5.9.0-rc.7121" />
<package id="NuGet.Commands" version="5.9.0-rc.7121" />
<package id="NuGet.Common" version="5.9.0-rc.7121" />
<package id="NuGet.Configuration" version="5.9.0-rc.7121" />
<package id="NuGet.Credentials" version="5.9.0-rc.7121" />
<package id="NuGet.DependencyResolver.Core" version="5.9.0-rc.7121" />
<package id="NuGet.Frameworks" version="5.9.0-rc.7121" />
<package id="NuGet.LibraryModel" version="5.9.0-rc.7121" />
<package id="NuGet.Packaging" version="5.9.0-rc.7121" />
<package id="NuGet.ProjectModel" version="5.9.0-rc.7121" />
<package id="NuGet.Protocol" version="5.9.0-rc.7121" />
<package id="NuGet.Versioning" version="5.9.0-rc.7121" />
<package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.1.21102.12" />
<package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.1.21102.12" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.1.21102.12" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.1.21102.12" />
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.1.21102.12" />
<package id="SQLitePCLRaw.bundle_green" version="1.1.2" />
<package id="SQLitePCLRaw.core" version="1.1.2" />
<package id="SQLitePCLRaw.provider.e_sqlite3.net45" version="1.1.2" />
<package id="System.Buffers" version="4.5.1" />
<package id="System.Collections.Immutable" version="1.7.1" />
<package id="System.Collections.Immutable" version="5.0.0" />
<package id="System.Memory" version="4.5.4" />
<package id="System.Numerics.Vectors" version="4.5.0" />
<package id="System.Resources.Extensions" version="4.7.1" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" />
<package id="System.Text.Encodings.Web" version="4.7.1" />
<package id="System.Text.Json" version="4.7.2" />
<package id="System.Threading.Tasks.Dataflow" version="4.11.1" />
<package id="System.Threading.Tasks.Dataflow" version="5.0.0" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" />
<package id="xunit.runner.console" version="2.4.0" />
</packages>