Skip to content

Commit

Permalink
Merge pull request dotnet#1615 from StephenBonikowsky/CoreFxSync_10_26
Browse files Browse the repository at this point in the history 
Updating several recent changes to shared build files.
  • Loading branch information
@StephenBonikowsky
StephenBonikowsky authored Oct 26, 2016
2 parents 3ae48a1 + a06df91 commit d09df74
Show file tree
Hide file tree
Showing 29 changed files with 119 additions and 87 deletions.
2 changes: 1 addition & 1 deletion BuildToolsVersion.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.26-prerelease-00912-02
1.0.26-prerelease-00921-01
2 changes: 1 addition & 1 deletion dependencies.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</StaticDependency>

<StaticDependency Include="Microsoft.xunit.netcore.extensions;Microsoft.DotNet.BuildTools.TestSuite">
<Version>1.0.0-prerelease-00830-02</Version>
<Version>1.0.0-prerelease-00925-01</Version>
</StaticDependency>

<StaticDependency Include="Microsoft.TargetingPack.Private.NETNative">
Expand Down
95 changes: 63 additions & 32 deletions init-tools.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ get_current_linux_name() {
elif [ "$(cat /etc/*-release | grep -cim1 debian)" -eq 1 ]; then
echo "debian"
return 0
elif [ "$(cat /etc/*-release | grep -cim1 alpine)" -eq 1 ]; then
echo "alpine"
return 0
elif [ "$(cat /etc/*-release | grep -cim1 fedora)" -eq 1 ]; then
if [ "$(cat /etc/*-release | grep -cim1 23)" -eq 1 ]; then
echo "fedora.23"
Expand Down Expand Up @@ -85,53 +88,81 @@ OSName=$(uname -s)
;;
esac
fi

if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then
__PATCH_CLI_NUGET_FRAMEWORKS=0

if [ -e $__TOOLRUNTIME_DIR ]; then rm -rf -- $__TOOLRUNTIME_DIR; fi
echo "Running: $__scriptpath/init-tools.sh" > $__init_tools_log

if [ ! -e $__DOTNET_PATH ]; then
echo "Installing dotnet cli..."
__DOTNET_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz"
# curl has HTTPS CA trust-issues less often than wget, so lets try that first.
echo "Installing '${__DOTNET_LOCATION}' to '$__DOTNET_PATH/dotnet.tar'" >> $__init_tools_log
which curl > /dev/null 2> /dev/null
if [ $? -ne 0 ]; then
mkdir -p "$__DOTNET_PATH"
wget -q -O $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION}

mkdir -p "$__DOTNET_PATH"

if [ -n "$DOTNET_TOOLSET_DIR" ] && [ -d "$DOTNET_TOOLSET_DIR/$__DOTNET_TOOLS_VERSION" ]; then
echo "Copying $DOTNET_TOOLSET_DIR/$__DOTNET_TOOLS_VERSION to $__DOTNET_PATH" >> $__init_tools_log
cp -r $DOTNET_TOOLSET_DIR/$__DOTNET_TOOLS_VERSION/* $__DOTNET_PATH
elif [ -n "$DOTNET_TOOL_DIR" ] && [ -d "$DOTNET_TOOL_DIR" ]; then
echo "Copying $DOTNET_TOOL_DIR to $__DOTNET_PATH" >> $__init_tools_log
cp -r $DOTNET_TOOL_DIR/* $__DOTNET_PATH
else
curl --retry 10 -sSL --create-dirs -o $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION}
fi
cd $__DOTNET_PATH
tar -xf $__DOTNET_PATH/dotnet.tar
echo "Installing dotnet cli..."
__DOTNET_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz"
# curl has HTTPS CA trust-issues less often than wget, so lets try that first.
echo "Installing '${__DOTNET_LOCATION}' to '$__DOTNET_PATH/dotnet.tar'" >> $__init_tools_log
which curl > /dev/null 2> /dev/null
if [ $? -ne 0 ]; then
wget -q -O $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION}
else
curl --retry 10 -sSL --create-dirs -o $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION}
fi
cd $__DOTNET_PATH
tar -xf $__DOTNET_PATH/dotnet.tar

cd $__scriptpath

cd $__scriptpath
__PATCH_CLI_NUGET_FRAMEWORKS=1
fi
fi

if [ ! -d "$__PROJECT_JSON_PATH" ]; then mkdir "$__PROJECT_JSON_PATH"; fi
echo $__PROJECT_JSON_CONTENTS > "$__PROJECT_JSON_FILE"

if [ ! -e $__BUILD_TOOLS_PATH ]; then
echo "Restoring BuildTools version $__BUILD_TOOLS_PACKAGE_VERSION..."
echo "Running: $__DOTNET_CMD restore \"$__PROJECT_JSON_FILE\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE" >> $__init_tools_log
$__DOTNET_CMD restore "$__PROJECT_JSON_FILE" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE >> $__init_tools_log
if [ ! -e "$__BUILD_TOOLS_PATH/init-tools.sh" ]; then echo "ERROR: Could not restore build tools correctly. See '$__init_tools_log' for more details."1>&2; fi
fi
if [ -n "$BUILD_TOOLS_TOOLSET_DIR" ] && [ -d "$BUILD_TOOLS_TOOLSET_DIR/$__BUILD_TOOLS_PACKAGE_VERSION" ]; then
echo "Copying $BUILD_TOOLS_TOOLSET_DIR/$__BUILD_TOOLS_PACKAGE_VERSION to $__TOOLRUNTIME_DIR" >> $__init_tools_log
cp -r $BUILD_TOOLS_TOOLSET_DIR/$__BUILD_TOOLS_PACKAGE_VERSION/* $__TOOLRUNTIME_DIR
elif [ -n "$BUILD_TOOLS_TOOL_DIR" ] && [ -d "$BUILD_TOOLS_TOOL_DIR" ]; then
echo "Copying $BUILD_TOOLS_TOOL_DIR to $__TOOLRUNTIME_DIR" >> $__init_tools_log
cp -r $BUILD_TOOLS_TOOL_DIR/* $__TOOLRUNTIME_DIR
else
if [ ! -d "$__PROJECT_JSON_PATH" ]; then mkdir "$__PROJECT_JSON_PATH"; fi
echo $__PROJECT_JSON_CONTENTS > "$__PROJECT_JSON_FILE"

if [ ! -e $__BUILD_TOOLS_PATH ]; then
echo "Restoring BuildTools version $__BUILD_TOOLS_PACKAGE_VERSION..."
echo "Running: $__DOTNET_CMD restore \"$__PROJECT_JSON_FILE\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE" >> $__init_tools_log
$__DOTNET_CMD restore "$__PROJECT_JSON_FILE" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE >> $__init_tools_log
if [ ! -e "$__BUILD_TOOLS_PATH/init-tools.sh" ]; then echo "ERROR: Could not restore build tools correctly. See '$__init_tools_log' for more details."1>&2; fi
fi

echo "Initializing BuildTools..."
echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR" >> $__init_tools_log
$__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR >> $__init_tools_log
if [ "$?" != "0" ]; then
echo "ERROR: An error occured when trying to initialize the tools. Please check '$__init_tools_log' for more details."1>&2
exit 1
echo "Initializing BuildTools..."
echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR" >> $__init_tools_log
$__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR >> $__init_tools_log
if [ "$?" != "0" ]; then
echo "ERROR: An error occured when trying to initialize the tools. Please check '$__init_tools_log' for more details."1>&2
exit 1
fi
fi

echo "Updating CLI NuGet Frameworks map..."
cp $__TOOLRUNTIME_DIR/NuGet.Frameworks.dll $__TOOLRUNTIME_DIR/dotnetcli/sdk/$__DOTNET_TOOLS_VERSION >> $__init_tools_log
if [ "$?" != "0" ]; then
echo "ERROR: An error occured when updating Nuget for CLI . Please check '$__init_tools_log' for more details."1>&2
exit 1
if [ $__PATCH_CLI_NUGET_FRAMEWORKS -eq 1 ]; then
echo "Updating CLI NuGet Frameworks map..."
cp $__TOOLRUNTIME_DIR/NuGet.Frameworks.dll $__TOOLRUNTIME_DIR/dotnetcli/sdk/$__DOTNET_TOOLS_VERSION >> $__init_tools_log
if [ "$?" != "0" ]; then
echo "ERROR: An error occured when updating Nuget for CLI . Please check '$__init_tools_log' for more details."1>&2
exit 1
fi
fi

touch $__INIT_TOOLS_DONE_MARKER

echo "Done initializing tools."
else
echo "Tools are already initialized"
Expand Down
7 changes: 4 additions & 3 deletions src/Common/test-runtime/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
"Microsoft.DotNet.xunit.performance.analysis.cli": "1.0.0-alpha-build0040",
"Microsoft.DotNet.xunit.performance.runner.cli": "1.0.0-alpha-build0040",
"Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02",
"xunit.console.netcore": "1.0.3-prerelease-00704-04",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01",
"xunit.console.netcore": "1.0.3-prerelease-00925-01",
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"System.Net.Security": "4.4.0-beta-24605-03",
"System.Net.WebSockets.Client": "4.4.0-beta-24605-03"
},
Expand All @@ -23,7 +24,7 @@
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
"System.Console": "4.4.0-beta-24605-03",
"microsoft.xunit.runner.uwp": "1.0.3-prerelease-00614-01",
"microsoft.xunit.runner.uwp": "1.0.3-prerelease-00925-01",
"Microsoft.DotNet.TestILC": {
"version": "1.4.24208-prerelease",
"include": "contentFiles"
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Common/Infrastructure/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Scenarios/Binding/Custom/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Scenarios/Binding/Tcp/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Scenarios/Contract/Fault/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageEncoder/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions ...System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Scenarios/Infrastructure/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.ServiceModel.Duplex/tests/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.ServiceModel.Http/tests/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00830-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
Loading

0 comments on commit d09df74

Please sign in to comment.