Merge branch 'master' into stebon/master/CleanupAndUpdateDependencies

dotnet · Sep 17, 2018 · 9ccf5a0 · 9ccf5a0
2 parents da1f938 + 5881a4b
commit 9ccf5a0
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 10 deletions.
diff --git a/external/harvestPackages/harvestPackages.netstandard1.6.depproj b/external/harvestPackages/harvestPackages.netstandard1.6.depproj
@@ -15,22 +15,22 @@
 
   <ItemGroup>
     <PackageReference Include="System.Private.ServiceModel">
-      <Version>4.3.1</Version>
+      <Version>4.3.3</Version>
     </PackageReference>
     <PackageReference Include="System.ServiceModel.Duplex">
-      <Version>4.3.1</Version>
+      <Version>4.3.3</Version>
     </PackageReference>
     <PackageReference Include="System.ServiceModel.Http">
-      <Version>4.3.1</Version>
+      <Version>4.3.3</Version>
     </PackageReference>
     <PackageReference Include="System.ServiceModel.NetTcp">
-      <Version>4.3.1</Version>
+      <Version>4.3.3</Version>
     </PackageReference>
     <PackageReference Include="System.ServiceModel.Primitives">
-      <Version>4.3.1</Version>
+      <Version>4.3.3</Version>
     </PackageReference>
     <PackageReference Include="System.ServiceModel.Security">
-      <Version>4.3.1</Version>
+      <Version>4.3.3</Version>
     </PackageReference>
   </ItemGroup>
 

diff --git a/pkg/baseline/packageIndex.json b/pkg/baseline/packageIndex.json
@@ -74,7 +74,7 @@
         "4.0.1.0": "4.0.1",
         //"4.0.1.0": "4.0.2",
         "4.0.2.0": "4.3.0",
-	    //"4.0.2.0": "4.3.1",
+	      //"4.0.2.0": "4.3.1",
         "4.0.2.1": "4.3.2",
         "4.0.2.2": "4.3.3",
         "4.1.0.0": "4.4.0",
@@ -117,7 +117,7 @@
         "4.1.0.0": "4.1.0",
         //"4.1.0.0": "4.1.1",
         "4.1.1.0": "4.3.0",
-	    //"4.1.1.0": "4.3.1",
+	      //"4.1.1.0": "4.3.1",
         "4.1.1.1": "4.3.2",
         "4.1.1.2": "4.3.3",
         "4.1.2.0": "4.4.0",
@@ -196,7 +196,7 @@
         "4.1.0.0": "4.1.0",
         //"4.1.0.0": "4.1.1",
         "4.1.1.0": "4.3.0",
-	    //"4.1.1.0": "4.3.1",
+	      //"4.1.1.0": "4.3.1",
         "4.1.1.1": "4.3.2",
         "4.1.1.2": "4.3.3",
         "4.2.0.0": "4.4.0",
@@ -237,7 +237,7 @@
         "4.0.1.0": "4.0.1",
         //"4.0.1.0": "4.0.2",
         "4.0.2.0": "4.3.0",
-	    //"4.0.2.0": "4.3.1",
+	      //"4.0.2.0": "4.3.1",
         "4.0.2.1": "4.3.2",
         "4.0.2.2": "4.3.3",
         "4.0.3.0": "4.4.0",

diff --git a/release-notes/dotnet-svcutil-notes.md b/release-notes/dotnet-svcutil-notes.md
@@ -7,6 +7,9 @@ Getting Started instructions can be found in the [usage guide](https://go.micros
 
 ## Version History
 
+### 1.0.3 (08/29/2018)
+* Bug fixes ([#3081](https://github.com/dotnet/wcf/issues/3081), [#3103](https://github.com/dotnet/wcf/issues/3103))
+
 ### 1.0.2 (08/06/2018)
 * Added debug verbosity option (--verbosity debug).
 * Bug fixes ([#2848](https://github.com/dotnet/wcf/issues/2848), [#2591](https://github.com/dotnet/wcf/issues/2591), [#2765](https://github.com/dotnet/wcf/issues/2765))

diff --git a/run.cmd b/run.cmd
@@ -34,6 +34,12 @@ if not defined VisualStudioVersion (
 :: misleading value (such as 'MCD' in HP PCs) may lead to build breakage (issue: #69).
 set Platform=
 
+
+:: Disable telemetry, first time experience, and global sdk look for the CLI
+set DOTNET_CLI_TELEMETRY_OPTOUT=1
+set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+set DOTNET_MULTILEVEL_LOOKUP=0
+
 :: Restore the Tools directory
 call %~dp0init-tools.cmd
 if NOT [%ERRORLEVEL%]==[0] exit /b 1

diff --git a/run.sh b/run.sh
@@ -2,6 +2,11 @@
 
 __scriptpath=$(cd "$(dirname "$0")"; pwd -P)
 
+# Disable telemetry, first time experience, and global sdk look for the CLI
+export DOTNET_CLI_TELEMETRY_OPTOUT=1
+export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+export DOTNET_MULTILEVEL_LOOKUP=0
+
 # Source the init-tools.sh script rather than execute in order to preserve ulimit values in child-processes. https://github.com/dotnet/corefx/issues/19152
 . $__scriptpath/init-tools.sh