Skip to content
This repository has been archived by the owner on Apr 20, 2023. It is now read-only.

Commit

Permalink
[release/3.1.1xx] Update dependencies from aspnet/websdk (#4112)
Browse files Browse the repository at this point in the history
* Update dependencies from https://github.com/aspnet/websdk build 20200118.3

- Microsoft.NET.Sdk.Web - 3.1.102-servicing.20068.3

* Revert back to coherent build

Co-authored-by: William Godbe <[email protected]>
  • Loading branch information
dotnet-maestro[bot] and wtgodbe committed Jan 20, 2020
1 parent e0c63c4 commit a46d93e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<add key="darc-pub-microsoft-msbuild-e901037-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-microsoft-msbuild-e901037f-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-core-setup-966115a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-966115a9/nuget/v3/index.json" />
<add key="darc-pub-dotnet-core-setup-916b5cb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-916b5cba/nuget/v3/index.json" />
<add key="darc-pub-dotnet-corefx-e946ceb-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-e946cebe-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
<add key="darc-pub-dotnet-aspnetcore-tooling-2dab42e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-2dab42e1/nuget/v3/index.json" />
Expand Down
22 changes: 11 additions & 11 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.2">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>966115a91565d43cd545c1b8acd83eda2a0cb4cb</Sha>
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.2-servicing.20070.1">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.2-servicing.20067.4">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>966115a91565d43cd545c1b8acd83eda2a0cb4cb</Sha>
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.102-servicing.20070.1">
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.102-servicing.20069.1">
<Uri>https://github.com/dotnet/cli</Uri>
<Sha>d449569824967fbcc1b6b7d43815f8c4c9678eb1</Sha>
<Sha>32fddd23b1e53272472f6feb27f5e12a445b7236</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.102-servicing.20068.5">
<Uri>https://github.com/dotnet/sdk</Uri>
Expand All @@ -38,9 +38,9 @@
<Sha>2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0</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.1.2-servicing.20069.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="3.1.2-servicing.20066.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>b30a16a465c9a0ed7e641a9d55df2f6e5c878a81</Sha>
<Sha>589ace3c9fdfa0f1ea1640b82304a6a7ac597871</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="5.4.0-rtm.6292">
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
Expand All @@ -50,9 +50,9 @@
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>55e7e45431c9c05656c999b902686e7402664573</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.101-servicing.19616.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-websdk</Uri>
<Sha>4774c8edf507ac3f3ad0afff5046d12fede56cc7</Sha>
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.102-servicing.20068.3">
<Uri>https://github.com/aspnet/websdk</Uri>
<Sha>589ed451f2bcb51d7f47a37ebf4e3d501979174c</Sha>
</Dependency>
<Dependency Name="ILLink.Tasks" Version="0.1.6-prerelease.19380.1">
<Uri>https://github.com/mono/linker</Uri>
Expand Down Expand Up @@ -90,4 +90,4 @@
<Sha>4d80b9cfa53e309c8f685abff3512f60c3d8a3d1</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
</Dependencies>
10 changes: 5 additions & 5 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<!-- Production Dependencies -->
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli -->
<MicrosoftDotNetCliRuntimePackageVersion>3.1.102-servicing.20070.1</MicrosoftDotNetCliRuntimePackageVersion>
<MicrosoftDotNetCliRuntimePackageVersion>3.1.102-servicing.20069.1</MicrosoftDotNetCliRuntimePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
Expand Down Expand Up @@ -41,14 +41,14 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/websdk -->
<MicrosoftNETSdkWebPackageVersion>3.1.101-servicing.19616.2</MicrosoftNETSdkWebPackageVersion>
<MicrosoftNETSdkWebPackageVersion>3.1.102-servicing.20068.3</MicrosoftNETSdkWebPackageVersion>
<MicrosoftNETSdkPublishPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkPublishPackageVersion>
<MicrosoftNETSdkWebProjectSystemPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkWebProjectSystemPackageVersion>
<MicrosoftNETSdkWorkerPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkWorkerPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://devdiv.visualstudio.com/DevDiv/_git/DotNet-Trusted -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>3.1.2-servicing.20069.7</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>3.1.2-servicing.20066.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/nuget/nuget.client -->
Expand Down Expand Up @@ -79,7 +79,7 @@
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.2-servicing.20070.1</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.2-servicing.20067.4</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
</PropertyGroup>
Expand All @@ -99,4 +99,4 @@
<_DotNetHiveRoot Condition="!HasTrailingSlash('$(_DotNetHiveRoot)')">$(_DotNetHiveRoot)/</_DotNetHiveRoot>
<DotNetExe>$(_DotNetHiveRoot)dotnet$(ExeExtension)</DotNetExe>
</PropertyGroup>
</Project>
</Project>

0 comments on commit a46d93e

Please sign in to comment.