Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/release/3.0.1xx' into merges/r…
Browse files Browse the repository at this point in the history 
…elease/3.0.1xx-to-release/3.1.1xx

* upstream/release/3.0.1xx: (231 commits)
  [release/3.0.1xx] Update dependencies from microsoft/vstest (#2809)
  Update dependencies from https://github.com/dotnet/cli build 20190911.11 (#2823)
  Update dependencies from https://github.com/aspnet/websdk build 20190911.2 (#2816)
  Update dependencies from https://github.com/dotnet/cli build 20190911.1 (#2807)
  Update dependencies from https://github.com/dotnet/cli build 20190910.6 (#2803)
  Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190910.12 (#2801)
  Update dependencies from https://github.com/dotnet/cli build 20190910.5 (#2799)
  Update dependencies from https://github.com/aspnet/websdk build 20190910.5 (#2798)
  Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190910.5 (#2797)
  Update dependencies from https://github.com/dotnet/arcade build 20190910.3 (#2796)
  Update dependencies from https://github.com/dotnet/cli build 20190910.4 (#2794)
  Update dependencies from https://github.com/aspnet/websdk build 20190910.4 (#2795)
  [release/3.0.1xx] Update dependencies from aspnet/AspNetCore-Tooling (#2759)
  Update dependencies from https://github.com/aspnet/websdk build 20190910.2 (#2792)
  Update dependencies from https://github.com/dotnet/core-setup build 20190910.02
  Update dependencies from https://github.com/dotnet/arcade build 20190909.10 (#2788)
  Update dependencies from https://github.com/dotnet/core-setup build 20190909.40 (#2781)
  Update dependencies from https://github.com/Microsoft/msbuild build 20190906.2 (#2779)
  Update dependencies from https://github.com/dotnet/core-setup build 20190909.33 (#2775)
  Update dependencies from https://github.com/dotnet/cli build 20190909.10 (#2771)
  ...

Conflicts:
eng/Version.Details.xml
eng/Versions.props
  • Loading branch information
@livarcocc
livarcocc committed Sep 11, 2019
2 parents 5ee5250 + 48d16a6 commit 79ad646
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
<Uri>https://github.com/dotnet/cli</Uri>
<Sha>a6e4f7bfd93943b9336fd4741343a3bdbc5f550b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-rc1.19422.1">
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-rc2.19455.7">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>83dffb6faab234c0c878e92c1679fa47c0cab3dd</Sha>
<Sha>b88161ed99ded0dd598779ad1afe044818422a6f</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="16.3.0-preview-19414-01">
<Dependency Name="Microsoft.Build" Version="16.3.0-preview-19456-02">
<Uri>https://github.com/Microsoft/msbuild</Uri>
<Sha>bbd9cfeca416875f020168a5c46898d90895c535</Sha>
<Sha>ee8294b5597fe21ca5c44c8fd4c142d27fcec2cb</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="10.7.0-beta.19460.5">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>e6bb0f12d5de504c819938a8f06fc46698b595c7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.3.0-beta3-19459-07">
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.3.1-beta3-19423-01">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f5ba9f2c61a2fe853dc4913888d40df221539147</Sha>
</Dependency>
Expand All @@ -30,21 +30,21 @@
<Sha>912b8a89a9dcedfc2b5046b91facde1ca01e94b1</Sha>
</Dependency>
<!-- For coherency purposes, this version should be gated by the version of wpf routed via core setup -->
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="3.0.0-rc1.19459.3" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="3.0.0-rc2.19459.11" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>b5574a2d2c6b2d5e55276a7707ae45c2d53c94ce</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="5.3.0-preview.2.6167">
<Dependency Name="NuGet.Build.Tasks" Version="5.3.0-rtm.6192">
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
<Sha>4590967639182b183b247355596aedc7d0855a86</Sha>
<Sha>bb60d6720d24890b8f3e071e70d27ea0f2bef57e</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.3.0-preview-20190822-01">
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.3.0-preview-20190911-02">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>e8a07507b66c5e5ebee63ee9ba82e2d643e367e2</Sha>
<Sha>32a75bd117876d8ad9c023cd0029df97412d1706</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.0.100-rc1.19422.3">
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.0.100-rc2.19461.2">
<Uri>https://github.com/aspnet/websdk</Uri>
<Sha>4a90ee700f3b496f826d777ce19fcdb95005e1ec</Sha>
<Sha>9471e9daf66b1e4f03d8b461c3ca0594f742923b</Sha>
</Dependency>
<Dependency Name="ILLink.Tasks" Version="0.1.6-prerelease.19380.1">
<Uri>https://github.com/mono/linker</Uri>
Expand Down
14 changes: 7 additions & 7 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>3.0.100-rc1.19422.1</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>3.0.100-rc2.19455.7</MicrosoftNETSdkPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
<MicrosoftBuildPackageVersion>16.3.0-preview-19414-01</MicrosoftBuildPackageVersion>
<MicrosoftBuildPackageVersion>16.3.0-preview-19456-02</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
<MicrosoftBuildLocalizationPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildLocalizationPackageVersion>
Expand All @@ -33,34 +33,34 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNETCoreCompilersPackageVersion>3.3.0-beta3-19459-07</MicrosoftNETCoreCompilersPackageVersion>
<MicrosoftNETCoreCompilersPackageVersion>3.3.1-beta3-19423-01</MicrosoftNETCoreCompilersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore-Tooling -->
<MicrosoftNETSdkRazorPackageVersion>3.1.0-alpha1.19460.13</MicrosoftNETSdkRazorPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/websdk -->
<MicrosoftNETSdkWebPackageVersion>3.0.100-rc1.19422.3</MicrosoftNETSdkWebPackageVersion>
<MicrosoftNETSdkWebPackageVersion>3.0.100-rc2.19461.2</MicrosoftNETSdkWebPackageVersion>
<MicrosoftNETSdkPublishPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkPublishPackageVersion>
<MicrosoftNETSdkWebProjectSystemPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkWebProjectSystemPackageVersion>
<MicrosoftNETSdkWorkerPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkWorkerPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://devdiv.visualstudio.com/DevDiv/_git/DotNet-Trusted -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>3.0.0-rc1.19459.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>3.0.0-rc2.19459.11</MicrosoftNETSdkWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/nuget/nuget.client -->
<NuGetBuildTasksPackageVersion>5.3.0-preview.2.6167</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksPackageVersion>5.3.0-rtm.6192</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksPackPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksPackPackageVersion>
<NuGetCommandLineXPlatPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommandLineXPlatPackageVersion>
<NuGetProjectModelPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetProjectModelPackageVersion>
<MicrosoftBuildNuGetSdkResolverPackageVersion>$(NuGetBuildTasksPackageVersion)</MicrosoftBuildNuGetSdkResolverPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/Microsoft/vstest -->
<MicrosoftNETTestSdkPackageVersion>16.3.0-preview-20190822-01</MicrosoftNETTestSdkPackageVersion>
<MicrosoftNETTestSdkPackageVersion>16.3.0-preview-20190911-02</MicrosoftNETTestSdkPackageVersion>
<MicrosoftTestPlatformCLIPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformCLIPackageVersion>
<MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
</PropertyGroup>
Expand Down

0 comments on commit 79ad646

Please sign in to comment.