Skip to content

Commit

Permalink
[master] Update dependencies from dotnet/arcade aspnet/Extensions (#1…
Browse files Browse the repository at this point in the history
…6370)

* Update dependencies from https://github.com/dotnet/arcade build 20190630.1

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19330.1

* Update dependencies from https://github.com/aspnet/Extensions build 20190701.1

- Microsoft.Extensions.DependencyInjection - 3.0.0-preview7.19351.1
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview7.19351.1
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview7.19351.1
- Microsoft.Extensions.Configuration - 3.0.0-preview7.19351.1
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview7.19351.1
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview7.19351.1
- Microsoft.Extensions.Logging - 3.0.0-preview7.19351.1

* Update dependencies from https://github.com/aspnet/Extensions build 20190701.2

- Microsoft.Extensions.DependencyInjection - 3.0.0-preview8.19351.2
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview8.19351.2
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview8.19351.2
- Microsoft.Extensions.Configuration - 3.0.0-preview8.19351.2
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview8.19351.2
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview8.19351.2
- Microsoft.Extensions.Logging - 3.0.0-preview8.19351.2

* Update dependencies from https://github.com/aspnet/Extensions build 20190701.4

- Microsoft.Extensions.DependencyInjection - 3.0.0-preview8.19351.4
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview8.19351.4
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview8.19351.4
- Microsoft.Extensions.Configuration - 3.0.0-preview8.19351.4
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview8.19351.4
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview8.19351.4
- Microsoft.Extensions.Logging - 3.0.0-preview8.19351.4

Dependency coherency updates

- Microsoft.CSharp - 4.6.0-preview8.19351.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-07 (parent: Microsoft.Extensions.Logging)
- Microsoft.DotNet.PlatformAbstractions - 3.0.0-preview8-27901-07 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview8-27901-07 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0-preview8.19351.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-07 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview8-27901-07 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview8-27901-07 (parent: Microsoft.Extensions.Logging)
- System.Collections.Immutable - 1.6.0-preview8.19351.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-07 (parent: Microsoft.Extensions.Logging)
- System.ComponentModel.Annotations - 4.6.0-preview8.19351.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-07 (parent: Microsoft.Extensions.Logging)
- System.Diagnostics.DiagnosticSource - 4.6.0-preview8.19351.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-07 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/Extensions build 20190701.5

- Microsoft.Extensions.DependencyInjection - 3.0.0-preview8.19351.5
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview8.19351.5
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview8.19351.5
- Microsoft.Extensions.Configuration - 3.0.0-preview8.19351.5
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview8.19351.5
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview8.19351.5
- Microsoft.Extensions.Logging - 3.0.0-preview8.19351.5

Dependency coherency updates

- Microsoft.CSharp - 4.6.0-preview8.19351.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-08 (parent: Microsoft.Extensions.Logging)
- Microsoft.DotNet.PlatformAbstractions - 3.0.0-preview8-27901-08 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview8-27901-08 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0-preview8.19351.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-08 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview8-27901-08 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview8-27901-08 (parent: Microsoft.Extensions.Logging)
- System.Collections.Immutable - 1.6.0-preview8.19351.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-08 (parent: Microsoft.Extensions.Logging)
- System.ComponentModel.Annotations - 4.6.0-preview8.19351.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-08 (parent: Microsoft.Extensions.Logging)
- System.Diagnostics.DiagnosticSource - 4.6.0-preview8.19351.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-08 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/Extensions build 20190701.6

- Microsoft.Extensions.DependencyInjection - 3.0.0-preview8.19351.6
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview8.19351.6
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview8.19351.6
- Microsoft.Extensions.Configuration - 3.0.0-preview8.19351.6
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview8.19351.6
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview8.19351.6
- Microsoft.Extensions.Logging - 3.0.0-preview8.19351.6

Dependency coherency updates

- Microsoft.CSharp - 4.6.0-preview8.19351.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- Microsoft.DotNet.PlatformAbstractions - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0-preview8.19351.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- System.Collections.Immutable - 1.6.0-preview8.19351.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- System.ComponentModel.Annotations - 4.6.0-preview8.19351.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- System.Diagnostics.DiagnosticSource - 4.6.0-preview8.19351.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/Extensions build 20190702.1

- Microsoft.Extensions.DependencyInjection - 3.0.0-preview8.19352.1
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview8.19352.1
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview8.19352.1
- Microsoft.Extensions.Configuration - 3.0.0-preview8.19352.1
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview8.19352.1
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview8.19352.1
- Microsoft.Extensions.Logging - 3.0.0-preview8.19352.1

Dependency coherency updates

- Microsoft.CSharp - 4.6.0-preview8.19351.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- Microsoft.DotNet.PlatformAbstractions - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0-preview8.19351.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- System.Collections.Immutable - 1.6.0-preview8.19351.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- System.ComponentModel.Annotations - 4.6.0-preview8.19351.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- System.Diagnostics.DiagnosticSource - 4.6.0-preview8.19351.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/Extensions build 20190702.2

- Microsoft.Extensions.DependencyInjection - 3.0.0-preview8.19352.2
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview8.19352.2
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview8.19352.2
- Microsoft.Extensions.Configuration - 3.0.0-preview8.19352.2
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview8.19352.2
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview8.19352.2
- Microsoft.Extensions.Logging - 3.0.0-preview8.19352.2

Dependency coherency updates

- Microsoft.CSharp - 4.6.0-preview8.19351.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- Microsoft.DotNet.PlatformAbstractions - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0-preview8.19351.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- System.Collections.Immutable - 1.6.0-preview8.19351.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- System.ComponentModel.Annotations - 4.6.0-preview8.19351.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)
- System.Diagnostics.DiagnosticSource - 4.6.0-preview8.19351.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27901-10 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/Extensions build 20190702.3

- Microsoft.Extensions.DependencyInjection - 3.0.0-preview8.19352.3
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview8.19352.3
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview8.19352.3
- Microsoft.Extensions.Configuration - 3.0.0-preview8.19352.3
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview8.19352.3
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview8.19352.3
- Microsoft.Extensions.Logging - 3.0.0-preview8.19352.3

Dependency coherency updates

- Microsoft.CSharp - 4.6.0-preview8.19352.1 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27902-02 (parent: Microsoft.Extensions.Logging)
- Microsoft.DotNet.PlatformAbstractions - 3.0.0-preview8-27902-02 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview8-27902-02 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0-preview8.19352.1 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27902-02 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview8-27902-02 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview8-27902-02 (parent: Microsoft.Extensions.Logging)
- System.Collections.Immutable - 1.6.0-preview8.19352.1 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27902-02 (parent: Microsoft.Extensions.Logging)
- System.ComponentModel.Annotations - 4.6.0-preview8.19352.1 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27902-02 (parent: Microsoft.Extensions.Logging)
- System.Diagnostics.DiagnosticSource - 4.6.0-preview8.19352.1 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27902-02 (parent: Microsoft.Extensions.Logging)

* Update nullability convention to new nullability metadata

See https://github.com/dotnet/roslyn/blob/master/docs/features/nullable-metadata.md.

Makes #16370 pass.
  • Loading branch information
dotnet-maestro[bot] authored Jul 2, 2019
1 parent e48f9a2 commit 6eef47d
Show file tree
Hide file tree
Showing 24 changed files with 883 additions and 139 deletions.
72 changes: 36 additions & 36 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,79 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.CSharp" Version="4.6.0-preview7.19326.13" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.CSharp" Version="4.6.0-preview8.19352.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>72da80db3fd14b84fefeef54ac0930c711f306f4</Sha>
<Sha>ec138afba514ce9b53d931d66129e02e8be147a1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PlatformAbstractions" Version="3.0.0-preview7-27826-20" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.DotNet.PlatformAbstractions" Version="3.0.0-preview8-27902-02" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>ee0c7ead1a46f06f98aff9102b785f532b71da9c</Sha>
<Sha>d31c9e8055992b61f4a1b8898b646e5fcb7b62b3</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="3.0.0-preview7.19328.2">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="3.0.0-preview8.19352.3">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>531db4e313e577192cdbca3931c4298b6db1e611</Sha>
<Sha>57863aedad5bac2e109345a70fa4de2acfebf34e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0-preview7.19328.2">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0-preview8.19352.3">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>531db4e313e577192cdbca3931c4298b6db1e611</Sha>
<Sha>57863aedad5bac2e109345a70fa4de2acfebf34e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="3.0.0-preview7.19328.2">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="3.0.0-preview8.19352.3">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>531db4e313e577192cdbca3931c4298b6db1e611</Sha>
<Sha>57863aedad5bac2e109345a70fa4de2acfebf34e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="3.0.0-preview7.19328.2">
<Dependency Name="Microsoft.Extensions.Configuration" Version="3.0.0-preview8.19352.3">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>531db4e313e577192cdbca3931c4298b6db1e611</Sha>
<Sha>57863aedad5bac2e109345a70fa4de2acfebf34e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="3.0.0-preview7.19328.2">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="3.0.0-preview8.19352.3">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>531db4e313e577192cdbca3931c4298b6db1e611</Sha>
<Sha>57863aedad5bac2e109345a70fa4de2acfebf34e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.0.0-preview7-27826-20" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.0.0-preview8-27902-02" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>ee0c7ead1a46f06f98aff9102b785f532b71da9c</Sha>
<Sha>d31c9e8055992b61f4a1b8898b646e5fcb7b62b3</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.0.0-preview7.19328.2">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.0.0-preview8.19352.3">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>531db4e313e577192cdbca3931c4298b6db1e611</Sha>
<Sha>57863aedad5bac2e109345a70fa4de2acfebf34e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-preview7.19328.2">
<Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-preview8.19352.3">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>531db4e313e577192cdbca3931c4298b6db1e611</Sha>
<Sha>57863aedad5bac2e109345a70fa4de2acfebf34e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19326.13" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview8.19352.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>72da80db3fd14b84fefeef54ac0930c711f306f4</Sha>
<Sha>ec138afba514ce9b53d931d66129e02e8be147a1</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0-preview7-27826-20" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0-preview8-27902-02" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>ee0c7ead1a46f06f98aff9102b785f532b71da9c</Sha>
<Sha>d31c9e8055992b61f4a1b8898b646e5fcb7b62b3</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.0-preview7-27826-20" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.0-preview8-27902-02" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>ee0c7ead1a46f06f98aff9102b785f532b71da9c</Sha>
<Sha>d31c9e8055992b61f4a1b8898b646e5fcb7b62b3</Sha>
</Dependency>
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview7-27826-20" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview8-27902-02" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>ee0c7ead1a46f06f98aff9102b785f532b71da9c</Sha>
<Sha>d31c9e8055992b61f4a1b8898b646e5fcb7b62b3</Sha>
</Dependency>
<Dependency Name="System.Collections.Immutable" Version="1.6.0-preview7.19326.13" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.Collections.Immutable" Version="1.6.0-preview8.19352.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>72da80db3fd14b84fefeef54ac0930c711f306f4</Sha>
<Sha>ec138afba514ce9b53d931d66129e02e8be147a1</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.Annotations" Version="4.6.0-preview7.19326.13" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.ComponentModel.Annotations" Version="4.6.0-preview8.19352.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>72da80db3fd14b84fefeef54ac0930c711f306f4</Sha>
<Sha>ec138afba514ce9b53d931d66129e02e8be147a1</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="4.6.0-preview7.19326.13" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="4.6.0-preview8.19352.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>72da80db3fd14b84fefeef54ac0930c711f306f4</Sha>
<Sha>ec138afba514ce9b53d931d66129e02e8be147a1</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19323.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19330.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9946534da4f73e6242ca105f6798ab58119c9ab0</Sha>
<Sha>89fab80685c91024c8f9e21f1c37f62580f648f8</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
34 changes: 17 additions & 17 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,27 @@
<MicrosoftDataSqlClientPackageVersion>1.0.19128.1-Preview</MicrosoftDataSqlClientPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from aspnet/Extensions">
<MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-preview7.19328.2</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>3.0.0-preview7.19328.2</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview7.19328.2</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview7.19328.2</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview7.19328.2</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.0.0-preview7.19328.2</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview7.19328.2</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-preview8.19352.3</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>3.0.0-preview8.19352.3</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview8.19352.3</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview8.19352.3</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview8.19352.3</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.0.0-preview8.19352.3</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview8.19352.3</MicrosoftExtensionsLoggingPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/corefx">
<MicrosoftCSharpPackageVersion>4.6.0-preview7.19326.13</MicrosoftCSharpPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview7.19326.13</MicrosoftNETCorePlatformsPackageVersion>
<SystemCollectionsImmutablePackageVersion>1.6.0-preview7.19326.13</SystemCollectionsImmutablePackageVersion>
<SystemComponentModelAnnotationsPackageVersion>4.6.0-preview7.19326.13</SystemComponentModelAnnotationsPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.6.0-preview7.19326.13</SystemDiagnosticsDiagnosticSourcePackageVersion>
<MicrosoftCSharpPackageVersion>4.6.0-preview8.19352.1</MicrosoftCSharpPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview8.19352.1</MicrosoftNETCorePlatformsPackageVersion>
<SystemCollectionsImmutablePackageVersion>1.6.0-preview8.19352.1</SystemCollectionsImmutablePackageVersion>
<SystemComponentModelAnnotationsPackageVersion>4.6.0-preview8.19352.1</SystemComponentModelAnnotationsPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.6.0-preview8.19352.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/core-setup">
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.0.0-preview7-27826-20</MicrosoftDotNetPlatformAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview7-27826-20</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.0.0-preview7-27826-20</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.0-preview7-27826-20</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-preview7-27826-20</NETStandardLibraryRefPackageVersion>
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.0.0-preview8-27902-02</MicrosoftDotNetPlatformAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview8-27902-02</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.0.0-preview8-27902-02</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.0-preview8-27902-02</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-preview8-27902-02</NETStandardLibraryRefPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Dependency version settings">
<!--
Expand Down
30 changes: 15 additions & 15 deletions eng/common/SigningValidation.proj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<Project Sdk="Microsoft.NET.Sdk">
<!--
This MSBuild file is intended to be used as the body of the default
This MSBuild file is intended to be used as the body of the default
publishing release pipeline. The release pipeline will use this file
to invoke the SignCheck tool to validate that packages about to
to invoke the the SignCheck tool to validate that packages about to
be published are correctly signed.
Parameters:
- PackageBasePath : Directory containing all files that need to be validated.
- SignCheckVersion : Version of SignCheck package to be used.
- SignValidationExclusionList : ItemGroup containing exclusion list to be forwarded to SignCheck.
Expand All @@ -33,7 +33,7 @@
<SignCheckErrorLog>signcheck.errors.log</SignCheckErrorLog>
<SignCheckExclusionsFile>signcheck.exclusions.txt</SignCheckExclusionsFile>
</PropertyGroup>

<ItemGroup>
<!--
Documentation for these arguments is available here:
Expand All @@ -45,36 +45,36 @@
<SignCheckArgs Include="--log-file $(SignCheckLog)" />
<SignCheckArgs Include="--error-log-file $(SignCheckErrorLog)" />
<SignCheckArgs Include="--input-files $(SignCheckInputDir)" />

<SignCheckArgs Include="--exclusions-file $(SignCheckExclusionsFile)" Condition="'@(SignValidationExclusionList)' != ''" />
<SignCheckArgs Include="--verify-jar" Condition="'$(EnableJarSigningCheck)' == 'true'" />
<SignCheckArgs Include="--verify-strongname" Condition="'$(EnableStrongNameCheck)' == 'true'" />
</ItemGroup>

<WriteLinesToFile
<WriteLinesToFile
File="$(SignCheckExclusionsFile)"
Lines="@(SignValidationExclusionList)"
Condition="'@(SignValidationExclusionList)' != ''"
Overwrite="true"
Encoding="Unicode"/>

<!--
IgnoreExitCode='true' because the tool doesn't return '0' on success.
-->
<Exec
<Exec
Command="&quot;$(SignCheckToolPath)&quot; @(SignCheckArgs, ' ')"
IgnoreExitCode='true'
ConsoleToMsBuild="false"
IgnoreExitCode='true'
ConsoleToMsBuild="false"
StandardErrorImportance="high" />

<Error
Text="Signing validation failed. Check $(SignCheckErrorLog) for more information."
<Error
Text="Signing validation failed. Check $(SignCheckErrorLog) for more information."
Condition="Exists($(SignCheckErrorLog)) and '$([System.IO.File]::ReadAllText($(SignCheckErrorLog)))' != ''" />

<Message
Text="##vso[artifact.upload containerfolder=LogFiles;artifactname=LogFiles]{SignCheckErrorLog}"
Condition="Exists($(SignCheckErrorLog)) and '$([System.IO.File]::ReadAllText($(SignCheckErrorLog)))' != ''" />

</Target>

<ItemGroup>
Expand Down
28 changes: 28 additions & 0 deletions eng/common/post-build/nuget-validation.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# This script validates NuGet package metadata information using this
# tool: https://github.com/NuGet/NuGetGallery/tree/jver-verify/src/VerifyMicrosoftPackage

param(
[Parameter(Mandatory=$true)][string] $PackagesPath, # Path to where the packages to be validated are
[Parameter(Mandatory=$true)][string] $ToolDestinationPath # Where the validation tool should be downloaded to
)

$ErrorActionPreference = "Stop"
Set-StrictMode -Version 2.0

. $PSScriptRoot\..\tools.ps1

try {
$url = "https://raw.githubusercontent.com/NuGet/NuGetGallery/jver-verify/src/VerifyMicrosoftPackage/verify.ps1"

New-Item -ItemType "directory" -Path ${ToolDestinationPath} -Force

Invoke-WebRequest $url -OutFile ${ToolDestinationPath}\verify.ps1

& ${ToolDestinationPath}\verify.ps1 ${PackagesPath}\*.nupkg
}
catch {
Write-PipelineTaskError "NuGet package validation failed. Please check error logs."
Write-Host $_
Write-Host $_.ScriptStackTrace
ExitWithExitCode 1
}
53 changes: 53 additions & 0 deletions eng/common/post-build/promote-build.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
param(
[Parameter(Mandatory=$true)][int] $BuildId,
[Parameter(Mandatory=$true)][int] $ChannelId,
[Parameter(Mandatory=$true)][string] $BarToken,
[string] $MaestroEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com",
[string] $ApiVersion = "2019-01-16"
)

$ErrorActionPreference = "Stop"
Set-StrictMode -Version 2.0

. $PSScriptRoot\..\tools.ps1

function Get-Headers([string]$accept, [string]$barToken) {
$headers = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]'
$headers.Add('Accept',$accept)
$headers.Add('Authorization',"Bearer $barToken")
return $headers
}

try {
$maestroHeaders = Get-Headers 'application/json' $BarToken

# Get info about which channels the build has already been promoted to
$getBuildApiEndpoint = "$MaestroEndpoint/api/builds/${BuildId}?api-version=$ApiVersion"
$buildInfo = Invoke-WebRequest -Method Get -Uri $getBuildApiEndpoint -Headers $maestroHeaders | ConvertFrom-Json

if (!$buildInfo) {
Write-Host "Build with BAR ID $BuildId was not found in BAR!"
ExitWithExitCode 1
}

# Find whether the build is already assigned to the channel or not
if ($buildInfo.channels) {
foreach ($channel in $buildInfo.channels) {
if ($channel.Id -eq $ChannelId) {
Write-Host "The build with BAR ID $BuildId is already on channel $ChannelId!"
ExitWithExitCode 0
}
}
}

Write-Host "Build not present in channel $ChannelId. Promoting build ... "

$promoteBuildApiEndpoint = "$maestroEndpoint/api/channels/${ChannelId}/builds/${BuildId}?api-version=$ApiVersion"
Invoke-WebRequest -Method Post -Uri $promoteBuildApiEndpoint -Headers $maestroHeaders
Write-Host "done."
}
catch {
Write-Host "There was an error while trying to promote build '$BuildId' to channel '$ChannelId'"
Write-Host $_
Write-Host $_.ScriptStackTrace
}
Loading

0 comments on commit 6eef47d

Please sign in to comment.