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

[release/3.1] Update dependencies from dotnet/corefx #8291

Merged
merged 5 commits into from
Sep 25, 2019
Merged

[release/3.1] Update dependencies from dotnet/corefx #8291

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d7c8ab9
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Sep 19, 2019
3d3cf3f
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Sep 20, 2019
085621a
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Sep 20, 2019
6910682
Add dotnet3 feed as a source
wtgodbe Sep 24, 2019
d075493
adding back the comment
Anipik Sep 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,8 @@
<packageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<add key="darc-pub-dotnet-standard-a5b5f2e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-standard-a5b5f2e1/nuget/v3/index.json" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

<!--
'src/test/PrepareTestAssets/PrepareTestAssets.proj' generates a NuGet.config file using this
one as a template. The following line is a marker to insert the test restore sources.
-->
<!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change to stop Darc from removing these should be rolled out, but @wtgodbe, I think because you had to add the dotnet3 feed, it would make sense to fix this PR up the rest of the way to unblock future PRs which will (?) also need it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dagood what else needs to be done here? An Arcade update?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just adding back the comments here will work. For future PRs, this will just work, because Darc does its thing serverside, not based on anything in the repo.


<add key="dotnet3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json" />
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="dotnet-coreclr" value="https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json" />
<add key="dotnet-windowsdesktop" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
Expand Down
108 changes: 54 additions & 54 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,117 +1,117 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.0-preview1.19463.3">
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Targets" Version="3.1.0-preview1.19463.3">
<Dependency Name="Microsoft.NETCore.Targets" Version="3.1.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-preview1.19463.3">
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="4.7.0-preview1.19463.3">
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry" Version="4.7.0-preview1.19463.3">
<Dependency Name="Microsoft.Win32.Registry" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="4.7.0-preview1.19463.3">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="Microsoft.Windows.Compatibility" Version="3.1.0-preview1.19463.3">
<Dependency Name="Microsoft.Windows.Compatibility" Version="3.1.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.CodeDom" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.Diagnostics.EventLog" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.DirectoryServices" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.Drawing.Common" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.IO.FileSystem.AccessControl" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.IO.FileSystem.AccessControl" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.Resources.Extensions" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.IO.Packaging" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.IO.Pipes.AccessControl" Version="4.5.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>7ee84596d92e178bce54c986df31ccc52479e772 </Sha>
</Dependency>
<Dependency Name="System.Security.AccessControl" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.Security.AccessControl" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Cng" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.Security.Cryptography.Cng" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Pkcs" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.Security.Cryptography.Pkcs" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.Security.Cryptography.Xml" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.Security.Permissions" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.Security.Principal.Windows" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.Security.Principal.Windows" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.Text.Encodings.Web" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.Text.Json" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.Threading.AccessControl" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.Threading.AccessControl" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="4.7.0-preview1.19463.3">
<Dependency Name="System.Windows.Extensions" Version="4.7.0-preview1.19470.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
<Sha>6a4153689e79a8e58ee3ed77e04d04a0d9dc2ea6</Sha>
</Dependency>
<Dependency Name="NETStandard.Library" Version="2.1.0">
<Uri>https://github.com/dotnet/standard</Uri>
Expand Down
52 changes: 26 additions & 26 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,34 +31,34 @@
<!-- sourcelink -->
<MicrosoftSourceLinkVersion>1.0.0-beta2-19367-01</MicrosoftSourceLinkVersion>
<!-- corefx -->
<MicrosoftNETCorePlatformsPackageVersion>3.1.0-preview1.19463.3</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreTargetsPackageVersion>3.1.0-preview1.19463.3</MicrosoftNETCoreTargetsPackageVersion>
<MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.7.0-preview1.19463.3</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
<MicrosoftWin32RegistryAccessControlVersion>4.7.0-preview1.19463.3</MicrosoftWin32RegistryAccessControlVersion>
<MicrosoftWin32RegistryVersion>4.7.0-preview1.19463.3</MicrosoftWin32RegistryVersion>
<MicrosoftWin32SystemEventsVersion>4.7.0-preview1.19463.3</MicrosoftWin32SystemEventsVersion>
<MicrosoftWindowsCompatibilityPackageVersion>3.1.0-preview1.19463.3</MicrosoftWindowsCompatibilityPackageVersion>
<SystemCodeDomVersion>4.7.0-preview1.19463.3</SystemCodeDomVersion>
<SystemConfigurationConfigurationManagerVersion>4.7.0-preview1.19463.3</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsEventLogVersion>4.7.0-preview1.19463.3</SystemDiagnosticsEventLogVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.1.0-preview1.19470.8</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreTargetsPackageVersion>3.1.0-preview1.19470.8</MicrosoftNETCoreTargetsPackageVersion>
<MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.7.0-preview1.19470.8</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
<MicrosoftWin32RegistryAccessControlVersion>4.7.0-preview1.19470.8</MicrosoftWin32RegistryAccessControlVersion>
<MicrosoftWin32RegistryVersion>4.7.0-preview1.19470.8</MicrosoftWin32RegistryVersion>
<MicrosoftWin32SystemEventsVersion>4.7.0-preview1.19470.8</MicrosoftWin32SystemEventsVersion>
<MicrosoftWindowsCompatibilityPackageVersion>3.1.0-preview1.19470.8</MicrosoftWindowsCompatibilityPackageVersion>
<SystemCodeDomVersion>4.7.0-preview1.19470.8</SystemCodeDomVersion>
<SystemConfigurationConfigurationManagerVersion>4.7.0-preview1.19470.8</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsEventLogVersion>4.7.0-preview1.19470.8</SystemDiagnosticsEventLogVersion>
<SystemDiagnosticsPerformanceCounter>4.6.0-preview8.19375.15</SystemDiagnosticsPerformanceCounter>
<SystemDirectoryServicesVersion>4.7.0-preview1.19463.3</SystemDirectoryServicesVersion>
<SystemDrawingCommonVersion>4.7.0-preview1.19463.3</SystemDrawingCommonVersion>
<SystemIOFileSystemAccessControlVersion>4.7.0-preview1.19463.3</SystemIOFileSystemAccessControlVersion>
<SystemIOPackagingVersion>4.7.0-preview1.19463.3</SystemIOPackagingVersion>
<SystemDirectoryServicesVersion>4.7.0-preview1.19470.8</SystemDirectoryServicesVersion>
<SystemDrawingCommonVersion>4.7.0-preview1.19470.8</SystemDrawingCommonVersion>
<SystemIOFileSystemAccessControlVersion>4.7.0-preview1.19470.8</SystemIOFileSystemAccessControlVersion>
<SystemIOPackagingVersion>4.7.0-preview1.19470.8</SystemIOPackagingVersion>
<SystemIOPipesAccessControl>4.5.1</SystemIOPipesAccessControl>
<SystemResourcesExtensionsPackageVersion>4.7.0-preview1.19463.3</SystemResourcesExtensionsPackageVersion>
<SystemSecurityAccessControlVersion>4.7.0-preview1.19463.3</SystemSecurityAccessControlVersion>
<SystemSecurityCryptographyCngVersion>4.7.0-preview1.19463.3</SystemSecurityCryptographyCngVersion>
<SystemSecurityCryptographyPkcsVersion>4.7.0-preview1.19463.3</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyProtectedDataVersion>4.7.0-preview1.19463.3</SystemSecurityCryptographyProtectedDataVersion>
<SystemSecurityCryptographyXmlVersion>4.7.0-preview1.19463.3</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>4.7.0-preview1.19463.3</SystemSecurityPermissionsVersion>
<SystemSecurityPrincipalWindowsVersion>4.7.0-preview1.19463.3</SystemSecurityPrincipalWindowsVersion>
<SystemTextEncodingsWebVersion>4.7.0-preview1.19463.3</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>4.7.0-preview1.19463.3</SystemTextJsonVersion>
<SystemThreadingAccessControlVersion>4.7.0-preview1.19463.3</SystemThreadingAccessControlVersion>
<SystemWindowsExtensionsPackageVersion>4.7.0-preview1.19463.3</SystemWindowsExtensionsPackageVersion>
<SystemResourcesExtensionsPackageVersion>4.7.0-preview1.19470.8</SystemResourcesExtensionsPackageVersion>
<SystemSecurityAccessControlVersion>4.7.0-preview1.19470.8</SystemSecurityAccessControlVersion>
<SystemSecurityCryptographyCngVersion>4.7.0-preview1.19470.8</SystemSecurityCryptographyCngVersion>
<SystemSecurityCryptographyPkcsVersion>4.7.0-preview1.19470.8</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyProtectedDataVersion>4.7.0-preview1.19470.8</SystemSecurityCryptographyProtectedDataVersion>
<SystemSecurityCryptographyXmlVersion>4.7.0-preview1.19470.8</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>4.7.0-preview1.19470.8</SystemSecurityPermissionsVersion>
<SystemSecurityPrincipalWindowsVersion>4.7.0-preview1.19470.8</SystemSecurityPrincipalWindowsVersion>
<SystemTextEncodingsWebVersion>4.7.0-preview1.19470.8</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>4.7.0-preview1.19470.8</SystemTextJsonVersion>
<SystemThreadingAccessControlVersion>4.7.0-preview1.19470.8</SystemThreadingAccessControlVersion>
<SystemWindowsExtensionsPackageVersion>4.7.0-preview1.19470.8</SystemWindowsExtensionsPackageVersion>
<!-- standard -->
<NETStandardLibraryPackageVersion>2.1.0</NETStandardLibraryPackageVersion>
<!-- coreclr -->
Expand Down