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

Merged PR 32757: [internal/release/7.0.4xx] 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.FSharp.Compiler**: from 12.7.0-beta.23328.4 to 12.7.0-beta.23364.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.SourceBuild.Intermediate.fsharp**: from 7.0.400-beta.23328.4 to 7.0.400-beta.23364.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Test.Sdk**: from 17.7.0-preview-23362-01 to 17.7.0-preview-23364-03 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Net.Compilers.Toolset**: from 4.7.0-3.23361.9 to 4.7.0-3.23366.1 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:42f6b899-0677-45e7-d6f8-08db826b460b)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 42f6b899-0677-45e7-d6f8-08db826b460b
- **Build**: 20230719.15
- **Date Produced**: July 19, 2023 10:35:05 PM UTC
- **Commit**: 8e1f76c1f41ecd37935288c617c53342533db704
- **Branch**: refs/heads/internal/release/7.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.400 to 7.0.400][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.400-rtm.23367.20 to 7.0.400-rtm.23369.15][1]
  - **Microsoft.NET.Sdk**: [from 7.0.400-rtm.23367.20 to 7.0.400-rtm.23369.15][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.400-rtm.23367.20 to 7.0.400-rtm.23369.15][1]
  - **Microsoft.FSharp.Compiler**: [from 12.7.0-beta.23328.4 to 12.7.0-beta.23364.5][2]
  - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 7.0.400-beta.23328.4 to 7.0.400-beta.23364.5][2]
  - **Microsoft.NET.Test.Sdk**: [from 17.7.0-preview-23362-01 to 17.7.0-preview-23364-03][3]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.7.0-3.23361.9 to 4.7.0-3.23366.1][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9f9d6fed9c&targetVersion=GC8e1f76c1f4&_a=files
[2]: 521a4efba7...159a701477
[3]: d7f4faa42b...bc17bb9693
[4]: 91c9c05370...dad7898acd

[DependencyUpdate]: <> (End)

[marker]: <> (End:42f6b899-0677-45e7-d6f8-08db826b460b)
This commit is contained in:
DotNet Bot 2023-07-19 23:06:08 +00:00 committed by Sean Reeser
commit 92db475f1d
3 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
NuGet.config
View file

@ -11,18 +11,22 @@
<!-- End: Package sources from DotNet-msbuild-Trusted --> <!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-5a4c82e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-5a4c82ec/nuget/v3/index.json" /> <add key="darc-int-dotnet-aspnetcore-5a4c82e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-5a4c82ec/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-5a4c82e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-5a4c82ec-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore --> <!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk --> <!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-96ba1fe" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-96ba1fed/nuget/v3/index.json" /> <add key="darc-pub-dotnet-emsdk-96ba1fe" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-96ba1fed/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-96ba1fe-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-96ba1fed-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk --> <!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-a6dbb80" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a6dbb800/nuget/v3/index.json" /> <add key="darc-int-dotnet-runtime-a6dbb80" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a6dbb800/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-a6dbb80-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a6dbb800-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-9f9d6fe" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-9f9d6fed/nuget/v3/index.json" /> <add key="darc-int-dotnet-sdk-8e1f76c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-8e1f76c1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk --> <!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop --> <!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-996ed6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-996ed6b0/nuget/v3/index.json" /> <add key="darc-int-dotnet-windowsdesktop-996ed6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-996ed6b0/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-996ed6b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-996ed6b0-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--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" /> <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@ -44,14 +48,17 @@
<disabledPackageSources> <disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-5a4c82e-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-5a4c82e" value="true" /> <add key="darc-int-dotnet-aspnetcore-5a4c82e" value="true" />
<!-- End: Package sources from dotnet-aspnetcore --> <!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-a6dbb80-1" value="true" />
<add key="darc-int-dotnet-runtime-a6dbb80" value="true" /> <add key="darc-int-dotnet-runtime-a6dbb80" value="true" />
<!-- Begin: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-9f9d6fe" value="true" /> <add key="darc-int-dotnet-sdk-8e1f76c" value="true" />
<!-- End: Package sources from dotnet-sdk --> <!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop --> <!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-996ed6b-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-996ed6b" value="true" /> <add key="darc-int-dotnet-windowsdesktop-996ed6b" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->

30
eng/Version.Details.xml
View file

@ -100,20 +100,20 @@
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.400"> <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.400">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>9f9d6fed9c294ab1689c274616ef1e969b32d34a</Sha> <Sha>8e1f76c1f41ecd37935288c617c53342533db704</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.400-rtm.23367.20"> <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.400-rtm.23369.15">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>9f9d6fed9c294ab1689c274616ef1e969b32d34a</Sha> <Sha>8e1f76c1f41ecd37935288c617c53342533db704</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.400-rtm.23367.20"> <Dependency Name="Microsoft.NET.Sdk" Version="7.0.400-rtm.23369.15">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>9f9d6fed9c294ab1689c274616ef1e969b32d34a</Sha> <Sha>8e1f76c1f41ecd37935288c617c53342533db704</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" /> <SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.400-rtm.23367.20"> <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.400-rtm.23369.15">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>9f9d6fed9c294ab1689c274616ef1e969b32d34a</Sha> <Sha>8e1f76c1f41ecd37935288c617c53342533db704</Sha>
</Dependency> </Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> <!-- 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.10-servicing.23364.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.10-servicing.23364.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -124,18 +124,18 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>9a9892f5204f1a1b31ab2c81b025d6e35e0f3693</Sha> <Sha>9a9892f5204f1a1b31ab2c81b025d6e35e0f3693</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.7.0-beta.23328.4" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.FSharp.Compiler" Version="12.7.0-beta.23364.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri> <Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>521a4efba79d9afcfb18bc946d3dda5133252939</Sha> <Sha>159a701477f5ca1e2d960e9bf79ce05769b3c671</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.400-beta.23328.4" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.400-beta.23364.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri> <Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>521a4efba79d9afcfb18bc946d3dda5133252939</Sha> <Sha>159a701477f5ca1e2d960e9bf79ce05769b3c671</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" /> <SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview-23362-01" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview-23364-03" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/microsoft/vstest</Uri> <Uri>https://github.com/microsoft/vstest</Uri>
<Sha>d7f4faa42b22ba20d697b530dd6809a0c02e6278</Sha> <Sha>bc17bb9693cfc4778ded51aa0ab7f1065433f989</Sha>
<SourceBuild RepoName="vstest" ManagedOnly="true" /> <SourceBuild RepoName="vstest" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.23321.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.23321.1" CoherentParentDependency="Microsoft.NET.Sdk">
@ -144,9 +144,9 @@
<SourceBuild RepoName="linker" ManagedOnly="true" /> <SourceBuild RepoName="linker" ManagedOnly="true" />
<RepoName>linker</RepoName> <RepoName>linker</RepoName>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-3.23361.9" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-3.23366.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri> <Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>91c9c05370d84a902010c9e1f80aebcc3a467792</Sha> <Sha>dad7898acd6372d4380612b9f225db0c2cbfa1e9</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" /> <SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.Build" Version="17.7.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.Build" Version="17.7.1" CoherentParentDependency="Microsoft.NET.Sdk">

8
eng/Versions.props
View file

@ -70,15 +70,15 @@
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk --> <!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.400</MicrosoftDotNetCommonItemTemplatesPackageVersion> <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.400</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.400-rtm.23367.20</MicrosoftNETSdkPackageVersion> <MicrosoftNETSdkPackageVersion>7.0.400-rtm.23369.15</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.400-rtm.23367.20</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.400-rtm.23369.15</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn --> <!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.7.0-3.23361.9</MicrosoftNetCompilersToolsetPackageVersion> <MicrosoftNetCompilersToolsetPackageVersion>4.7.0-3.23366.1</MicrosoftNetCompilersToolsetPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/corefx --> <!-- Dependencies from https://github.com/dotnet/corefx -->
@ -199,7 +199,7 @@
<PropertyGroup> <PropertyGroup>
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion> <VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion> <DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
<MicrosoftNETTestSdkVersion>17.7.0-preview-23362-01</MicrosoftNETTestSdkVersion> <MicrosoftNETTestSdkVersion>17.7.0-preview-23364-03</MicrosoftNETTestSdkVersion>
</PropertyGroup> </PropertyGroup>
<!-- dependencies for source-build tarball --> <!-- dependencies for source-build tarball -->
<PropertyGroup> <PropertyGroup>