mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merged PR 30762: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk

Browse source 
This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76
- **Build**: 20230418.9
- **Date Produced**: April 18, 2023 3:38:34 PM UTC
- **Commit**: fb94b17af2dd037d0b2e4d551efde34812083ba5
- **Branch**: refs/heads/internal/release/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.300 to 7.0.300][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.300-rtm.23215.6 to 7.0.300-rtm.23218.9][1]
  - **Microsoft.NET.Sdk**: [from 7.0.300-rtm.23215.6 to 7.0.300-rtm.23218.9][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.300-rtm.23215.6 to 7.0.300-rtm.23218.9][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.6 to 7.0.6][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.6 to 7.0.6][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2]
  - **dotnet-dev-certs**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2]
  - **dotnet-user-jwts**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2]
  - **dotnet-user-secrets**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC3f765dd3a0&targetVersion=GCfb94b17af2&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branch...
This commit is contained in:
DotNet Bot 2023-04-18 17:22:31 +00:00 • committed by Matt Mitchell
parent a3ba726ea1
commit 32ee2f1487
3 changed files with 35 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
NuGet.config
View file

@ -10,19 +10,22 @@
<add key="darc-pub-DotNet-msbuild-Trusted-8ffc3fe" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-8ffc3fe3/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-d4bac30" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-d4bac300/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-4515d4e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4515d4e1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-b0eec69" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b0eec69e/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-b0eec69-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b0eec69e-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-e3acf02" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e3acf029/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-e3acf02-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e3acf029-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-3f765dd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3f765dd3/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-fb94b17" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-fb94b17a/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-0af2ffd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0af2ffd3/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-0af2ffd-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0af2ffd3-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@ -44,14 +47,16 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-d4bac30" value="true" />
<add key="darc-int-dotnet-aspnetcore-4515d4e" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-e3acf02-1" value="true" />
<add key="darc-int-dotnet-runtime-e3acf02" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-3f765dd" value="true" />
<add key="darc-int-dotnet-sdk-fb94b17" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-0af2ffd-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-0af2ffd" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-runtime -->

38
eng/Version.Details.xml
View file

@ -54,32 +54,32 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>d4bac3001364e830ea9d8cc929b9dba56196e4f8</Sha>
<Sha>4515d4e1d70b50f899ee35cedf6be3a31098dd92</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.6-servicing.23214.13" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.6-servicing.23217.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>d4bac3001364e830ea9d8cc929b9dba56196e4f8</Sha>
<Sha>4515d4e1d70b50f899ee35cedf6be3a31098dd92</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>d4bac3001364e830ea9d8cc929b9dba56196e4f8</Sha>
<Sha>4515d4e1d70b50f899ee35cedf6be3a31098dd92</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.6-servicing.23214.13" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.6-servicing.23217.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>d4bac3001364e830ea9d8cc929b9dba56196e4f8</Sha>
<Sha>4515d4e1d70b50f899ee35cedf6be3a31098dd92</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="7.0.6-servicing.23214.13" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="7.0.6-servicing.23217.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>d4bac3001364e830ea9d8cc929b9dba56196e4f8</Sha>
<Sha>4515d4e1d70b50f899ee35cedf6be3a31098dd92</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="7.0.6-servicing.23214.13" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-jwts" Version="7.0.6-servicing.23217.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>d4bac3001364e830ea9d8cc929b9dba56196e4f8</Sha>
<Sha>4515d4e1d70b50f899ee35cedf6be3a31098dd92</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="7.0.6-servicing.23214.13" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="7.0.6-servicing.23217.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>d4bac3001364e830ea9d8cc929b9dba56196e4f8</Sha>
<Sha>4515d4e1d70b50f899ee35cedf6be3a31098dd92</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -100,20 +100,20 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.300">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>3f765dd3a04a69dc988088394b19f20e8d9ae4ce</Sha>
<Sha>fb94b17af2dd037d0b2e4d551efde34812083ba5</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.300-rtm.23215.6">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.300-rtm.23218.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>3f765dd3a04a69dc988088394b19f20e8d9ae4ce</Sha>
<Sha>fb94b17af2dd037d0b2e4d551efde34812083ba5</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.300-rtm.23215.6">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.300-rtm.23218.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>3f765dd3a04a69dc988088394b19f20e8d9ae4ce</Sha>
<Sha>fb94b17af2dd037d0b2e4d551efde34812083ba5</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.300-rtm.23215.6">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.300-rtm.23218.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>3f765dd3a04a69dc988088394b19f20e8d9ae4ce</Sha>
<Sha>fb94b17af2dd037d0b2e4d551efde34812083ba5</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.6-servicing.23213.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

14
eng/Versions.props
View file

@ -58,11 +58,11 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.6</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.6</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.6-servicing.23214.13</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.6-servicing.23214.13</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.6-servicing.23214.13</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.6-servicing.23214.13</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.6-servicing.23214.13</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.6-servicing.23217.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.6-servicing.23217.6</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.6-servicing.23217.6</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.6-servicing.23217.6</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.6-servicing.23217.6</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
@ -70,8 +70,8 @@
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.300</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.300-rtm.23215.6</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.300-rtm.23215.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.300-rtm.23218.9</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.300-rtm.23218.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>