dotnet · zhenlan · Mar 23, 2018 · Mar 22, 2018 · Mar 23, 2018 · Mar 23, 2018
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt
@@ -1 +1 @@
-2.1.0-preview1-02609-02
+2.1.0-preview2-02621-01
diff --git a/Documentation/WCF-Web-Service-Reference-guide.md b/Documentation/WCF-Web-Service-Reference-guide.md
diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt
@@ -1 +1 @@
-2.0.0-preview1-005977
+2.1.2
diff --git a/Packaging.props b/Packaging.props
@@ -1,6 +1,6 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PreReleaseLabel>preview1</PreReleaseLabel>
+    <PreReleaseLabel>preview2</PreReleaseLabel>
     <PackageDescriptionFile>$(ProjectDir)pkg/descriptions.json</PackageDescriptionFile>
     <PackageLicenseFile>$(ProjectDir)LICENSE.TXT</PackageLicenseFile>
     <PackageThirdPartyNoticesFile>$(ProjectDir)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>

diff --git a/dir.props b/dir.props
@@ -11,7 +11,7 @@
 
   <!-- Define vNext UAP Moniker -->
   <PropertyGroup>
-    <UAPvNextVersion>10.0.15138</UAPvNextVersion>
+    <UAPvNextVersion>10.0.16300</UAPvNextVersion>
     <UAPvNextTFMFull>UAP,Version=v$(UAPvNextVersion)</UAPvNextTFMFull>
     <UAPvNextTFM>uap$(UAPvNextVersion)</UAPvNextTFM>
   </PropertyGroup>

diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj
@@ -8,6 +8,7 @@
     <NugetRuntimeIdentifier Condition="'$(TargetGroup)' == 'uap'">win10-$(ArchGroup)</NugetRuntimeIdentifier>
     <NugetRuntimeIdentifier Condition="'$(TargetGroup)' == 'uapaot'">win10-$(ArchGroup)-aot</NugetRuntimeIdentifier>
     <RidSpecificAssets>true</RidSpecificAssets>
+    <NoWarn>$(NoWarn);NU1603;NU1605</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetGroup)' == 'uapaot'">

diff --git a/external/test-runtime/XUnit.Runtime.depproj b/external/test-runtime/XUnit.Runtime.depproj
@@ -13,6 +13,7 @@
     <NuGetTargetMonikerShort Condition="'$(TargetGroup)' == 'uapaot'">netstandard2.0</NuGetTargetMonikerShort>
     <NuGetTargetMoniker Condition="'$(TargetGroup)' == 'uap'">.NETStandard,Version=v2.0</NuGetTargetMoniker>
     <NuGetTargetMonikerShort Condition="'$(TargetGroup)' == 'uap'">netstandard2.0</NuGetTargetMonikerShort>
+    <NoWarn>$(NoWarn);NU1603</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="xunit.console.netcore">

diff --git a/init-tools.cmd b/init-tools.cmd
@@ -33,7 +33,7 @@ if exist "%DOTNET_CMD%" goto :afterdotnetrestore
 
 echo Installing dotnet cli...
 if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%"
-set DOTNET_ZIP_NAME=dotnet-dev-win-x64.%DOTNET_VERSION%.zip
+set DOTNET_ZIP_NAME=dotnet-sdk-%DOTNET_VERSION%-win-x64.zip
 set DOTNET_REMOTE_PATH=https://dotnetcli.azureedge.net/dotnet/Sdk/%DOTNET_VERSION%/%DOTNET_ZIP_NAME%
 set DOTNET_LOCAL_PATH=%DOTNET_PATH%%DOTNET_ZIP_NAME%
 echo Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> "%INIT_TOOLS_LOG%"
@@ -68,4 +68,4 @@ if not [%INIT_TOOLS_ERRORLEVEL%]==[0] (
 :: Create sempahore file
 echo Done initializing tools.
 echo Init-Tools.cmd completed for BuildTools Version: %BUILDTOOLS_VERSION% > "%BUILD_TOOLS_SEMAPHORE%"
-exit /b 0
+exit /b 0
diff --git a/init-tools.sh b/init-tools.sh
@@ -23,7 +23,7 @@ OSName=$(uname -s)
     case $OSName in
         Darwin)
             OS=OSX
-            __DOTNET_PKG=dotnet-dev-osx-x64
+            __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-osx-x64
             ulimit -n 2048
             # Format x.y.z as single integer with three digits for each part
             VERSION=`sw_vers -productVersion| sed -e 's/\./ /g' | xargs printf "%03d%03d%03d"`
@@ -34,14 +34,14 @@ OSName=$(uname -s)
             ;;
 
         Linux)
-            __DOTNET_PKG=dotnet-dev-linux-x64
+            __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-linux-x64
             OS=Linux
             ;;
 
         *)
             echo "Unsupported OS '$OSName' detected. Downloading linux-x64 tools."
             OS=Linux
-            __DOTNET_PKG=dotnet-dev-linux-x64
+            __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-linux-x64
             ;;
   esac
 fi
@@ -64,7 +64,7 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then
             cp -r $DOTNET_TOOL_DIR/* $__DOTNET_PATH
         else
             echo "Installing dotnet cli..."
-            __DOTNET_LOCATION="https://dotnetcli.azureedge.net/dotnet/Sdk/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz"
+            __DOTNET_LOCATION="https://dotnetcli.azureedge.net/dotnet/Sdk/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.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
@@ -98,11 +98,11 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then
         fi
 
         echo "Initializing BuildTools..."
-        echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR" >> $__init_tools_log
+        echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR $__PACKAGES_DIR" >> $__init_tools_log
 
         # Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424
         chmod +x $__BUILD_TOOLS_PATH/init-tools.sh
-        $__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 $__PACKAGES_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

diff --git a/pkg/baseline/packageIndex.json b/pkg/baseline/packageIndex.json
@@ -36,7 +36,9 @@
         "4.3.1"
       ],
       "BaselineVersion": "4.5.0",
-      "InboxOn": {},
+      "InboxOn": {
+        "uap10.0.16299": "4.1.1.0"
+      },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
         "4.0.1.0": "4.0.1",
@@ -55,7 +57,9 @@
         "4.3.1"
       ],
       "BaselineVersion": "4.5.0",
-      "InboxOn": {},
+      "InboxOn": {
+        "uap10.0.16299": "4.1.3.0"
+      },
       "AssemblyVersionInPackageVersion": {
         "3.9.0.0": "3.9.0",
         "4.0.0.0": "4.0.0",
@@ -74,7 +78,9 @@
         "4.3.1"
       ],
       "BaselineVersion": "4.5.0",
-      "InboxOn": {},
+      "InboxOn": {
+        "uap10.0.16299": "4.1.3.0"
+      },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
         "4.1.0.0": "4.1.0",
@@ -92,7 +98,9 @@
         "4.3.1"
       ],
       "BaselineVersion": "4.5.0",
-      "InboxOn": {},
+      "InboxOn": {
+        "uap10.0.16299": "4.2.1.0"
+      },
       "AssemblyVersionInPackageVersion": {
         "3.9.0.0": "3.9.0",
         "4.0.0.0": "4.0.0",
@@ -111,7 +119,9 @@
         "4.3.1"
       ],
       "BaselineVersion": "4.5.0",
-      "InboxOn": {},
+      "InboxOn": {
+        "uap10.0.16299": "4.0.4.0"
+      },
       "AssemblyVersionInPackageVersion": {
         "3.9.0.0": "3.9.0",
         "4.0.0.0": "4.0.0",

diff --git a/pkg/descriptions.json b/pkg/descriptions.json
@@ -71,5 +71,10 @@
             "System.ServiceModel.UpnEndpointIdentity",
             "System.ServiceModel.SpnEndpointIdentity"
         ]
+    },
+    {
+        "Name": "svcutilcore",
+        "Description": "Generate XML serializers for types used by Service Contracts in an assembly",
+        "CommonTypes": []
     }
 ]
diff --git a/release-notes/System.ServiceModel.Duplex.md b/release-notes/System.ServiceModel.Duplex.md
@@ -8,6 +8,17 @@
 
 ## Version History
 
+### 4.5.0-preview1-26228-01
+
+* [NuGet Package](https://www.nuget.org/packages/System.ServiceModel.Duplex/4.5.0-preview1-26228-01)
+* [Release tag](https://github.com/dotnet/wcf/releases/tag/v2.1.0-preview1)
+
+### 4.4.1
+
+* [NuGet Package](https://www.nuget.org/packages/System.ServiceModel.Duplex/4.4.1)
+* [Release tag](https://github.com/dotnet/wcf/releases/tag/v2.0.5)
+* [Supported features](https://github.com/dotnet/wcf/blob/master/release-notes/SupportedFeatures-v2.0.0.md)
+
 ### 4.4.0
 
 * [NuGet Package](https://www.nuget.org/packages/System.ServiceModel.Duplex/4.4.0)

diff --git a/release-notes/System.ServiceModel.Http.md b/release-notes/System.ServiceModel.Http.md
@@ -8,6 +8,17 @@
 
 ## Version History
 
+### 4.5.0-preview1-26228-01
+
+* [NuGet Package](https://www.nuget.org/packages/System.ServiceModel.Http/4.5.0-preview1-26228-01)
+* [Release tag](https://github.com/dotnet/wcf/releases/tag/v2.1.0-preview1)
+
+### 4.4.1
+
+* [NuGet Package](https://www.nuget.org/packages/System.ServiceModel.Http/4.4.1)
+* [Release tag](https://github.com/dotnet/wcf/releases/tag/v2.0.5)
+* [Supported features](https://github.com/dotnet/wcf/blob/master/release-notes/SupportedFeatures-v2.0.0.md)
+
 ### 4.4.0
 
 * [NuGet Package](https://www.nuget.org/packages/System.ServiceModel.Http/4.4.0)

diff --git a/release-notes/System.ServiceModel.NetTcp.md b/release-notes/System.ServiceModel.NetTcp.md
@@ -8,7 +8,18 @@
 
 ## Version History
 
-### 4.4.0
+### 4.5.0-preview1-26228-01
+
+* [NuGet Package](https://www.nuget.org/packages/System.ServiceModel.NetTcp/4.5.0-preview1-26228-01)
+* [Release tag](https://github.com/dotnet/wcf/releases/tag/v2.1.0-preview1)
+
+### 4.4.1
+
+* [NuGet Package](https://www.nuget.org/packages/System.ServiceModel.NetTcp/4.4.1)
+* [Release tag](https://github.com/dotnet/wcf/releases/tag/v2.0.5)
+* [Supported features](https://github.com/dotnet/wcf/blob/master/release-notes/SupportedFeatures-v2.0.0.md)
+
+### 4.4.0### 4.4.0
 
 * [NuGet Package](https://www.nuget.org/packages/System.ServiceModel.NetTcp/4.4.0)
 * [Release tag](https://github.com/dotnet/wcf/tree/v2.0.0)

diff --git a/release-notes/System.ServiceModel.Primitives.md b/release-notes/System.ServiceModel.Primitives.md
@@ -8,7 +8,18 @@
 
 ## Version History
 
-### 4.4.0
+### 4.5.0-preview1-26228-01
+
+* [NuGet Package](https://www.nuget.org/packages/System.ServiceModel.Primitives/4.5.0-preview1-26228-01)
+* [Release tag](https://github.com/dotnet/wcf/releases/tag/v2.1.0-preview1)
+
+### 4.4.1
+
+* [NuGet Package](https://www.nuget.org/packages/System.ServiceModel.Primitives/4.4.1)
+* [Release tag](https://github.com/dotnet/wcf/releases/tag/v2.0.5)
+* [Supported features](https://github.com/dotnet/wcf/blob/master/release-notes/SupportedFeatures-v2.0.0.md)
+
+### 4.4.0### 4.4.0
 
 * [NuGet Package](https://www.nuget.org/packages/System.ServiceModel.Primitives/4.4.0)
 * [Release tag](https://github.com/dotnet/wcf/tree/v2.0.0)

diff --git a/release-notes/System.ServiceModel.Security.md b/release-notes/System.ServiceModel.Security.md
@@ -8,7 +8,18 @@
 
 ## Version History
 
-### 4.4.0
+### 4.5.0-preview1-26228-01
+
+* [NuGet Package](https://www.nuget.org/packages/System.ServiceModel.Security/4.5.0-preview1-26228-01)
+* [Release tag](https://github.com/dotnet/wcf/releases/tag/v2.1.0-preview1)
+
+### 4.4.1
+
+* [NuGet Package](https://www.nuget.org/packages/System.ServiceModel.Security/4.4.1)
+* [Release tag](https://github.com/dotnet/wcf/releases/tag/v2.0.5)
+* [Supported features](https://github.com/dotnet/wcf/blob/master/release-notes/SupportedFeatures-v2.0.0.md)
+
+### 4.4.0### 4.4.0
 
 * [NuGet Package](https://www.nuget.org/packages/System.ServiceModel.Security/4.4.0)
 * [Release tag](https://github.com/dotnet/wcf/tree/v2.0.0)

diff --git a/release-notes/WCF-Web-Service-Reference-notes.md b/release-notes/WCF-Web-Service-Reference-notes.md
@@ -1,9 +1,24 @@
-# WCF Web Service Reference Provider - Release Notes
+# WCF Web Service Reference Provider - Release Notes
 
-WCF Web Service Reference connected services provider is now part of Visual Studio 2017. Instructions can be found in the [usage guide](/Documentation/WCF-Web-Service-Reference-guide.md) document. Please [let us know](https://github.com/dotnet/wcf/issues/new) if you run into any issues or have any feedback.
+WCF Web Service Reference connected services provider is now part of Visual Studio 2017. Instructions can be found in the [usage guide](https://go.microsoft.com/fwlink/?linkid=858814) document. Please [let us know](https://github.com/dotnet/wcf/issues/new) if you run into any issues or have any feedback.
 
 ## Release History
 
+### 3/21/2018 - Visual Studio 2017 v15.7 Preview 2.0 [27520.0.d15.7]
+* Improved support for future framework versions and bug fixes ([#2510](https://github.com/dotnet/wcf/issues/2510), [#2569](https://github.com/dotnet/wcf/issues/2569))
+
+### 3/13/2018 - Visual Studio 2017 v15.7 Preview 1.0 [27512.0.d15.7]
+* UI improvements and bug fixes ([#2104](https://github.com/dotnet/wcf/issues/2104))
+
+### 2/7/2018 - Visual Studio 2017 v15.6 Preview 4.0 [27406.0.d15.6]
+* Improved metadata processing. 
+* Bug fixes ([#2269](https://github.com/dotnet/wcf/issues/2269), [#2465](https://github.com/dotnet/wcf/issues/2465))
+
+### 1/25/2018 - Visual Studio 2017 v15.6 Preview 3.0 [27323.2.d15.6]
+* Building the user’s project is no longer required as part of the client code generation process ([#2384](https://github.com/dotnet/wcf/issues/2384)).
+* Bug fixes ([#2461](https://github.com/dotnet/wcf/issues/2461), [#2197](https://github.com/dotnet/wcf/issues/2197), [#2410](https://github.com/dotnet/wcf/issues/2410))
+
+
 ### 12/7/2017 - Visual Studio 2017 v15.6 Preview 1.0 [27205.0.d15.6]
 
 * Added support of updating an existing service reference. This simplifies the process for regenerating the WCF client proxy code for an updated web service (read [preview 1 blog post](https://blogs.msdn.microsoft.com/visualstudio/2017/12/07/visual-studio-2017-version-15-6-preview/) for more details).

diff --git a/src/GenerateDepsJson.targets b/src/GenerateDepsJson.targets
@@ -19,8 +19,9 @@
     </PropertyGroup>
 
     <GenerateDepsJson DepsJsonPath="$(_OriginalDepsJsonPath)"
+                      GenerateNewDepsJson="true"
                       RuntimeDirectory="$(NETCoreAppTestSharedFrameworkPath)"
                       DepsExceptions="@(ExceptionForDepsJson)"
                       OutputPath="$(_OutputTestSharedFrameworkDepsPath)"/>
   </Target>
-</Project>
+</Project>