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

Merge branch 'main' into darc-main-dc68738f-b749-4b60-aea3-e4d1a0747b8a

Browse source
This commit is contained in:
Noah Gilson 2023-05-11 11:38:51 -07:00 committed by GitHub
commit d3c97b0cc3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
eng/Version.Details.xml
View file

@ -102,22 +102,22 @@
<Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>45a41b353d078e4d1e5918246fddbacb452eb210</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.5.23260.32">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.5.23261.1">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>a663257e795a69f53dec6c0e2437492afb4567c2</Sha>
<Sha>77f9aaec2c4ea6dd392c72a28cd610bbf6fdfb30</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.5.23260.32">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.5.23261.1">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>a663257e795a69f53dec6c0e2437492afb4567c2</Sha>
<Sha>77f9aaec2c4ea6dd392c72a28cd610bbf6fdfb30</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.5.23260.32">
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.5.23261.1">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>a663257e795a69f53dec6c0e2437492afb4567c2</Sha>
<Sha>77f9aaec2c4ea6dd392c72a28cd610bbf6fdfb30</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.5.23260.32">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.5.23261.1">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>a663257e795a69f53dec6c0e2437492afb4567c2</Sha>
<Sha>77f9aaec2c4ea6dd392c72a28cd610bbf6fdfb30</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="8.0.0-preview.5.23259.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -186,25 +186,25 @@
<Sha>5661eb3d593b2150fb7e153ee31282722098690a</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.0.0-beta-22503-02">
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.1.0-beta.23253.1">
<Uri>https://github.com/dotnet/symreader</Uri>
<Sha>0c29b7109c054bdc578e917515ae7e8635b9cb9d</Sha>
<Sha>2c8079e2e8e78c0cd11ac75a32014756136ecdb9</Sha>
<SourceBuild RepoName="symreader" ManagedOnly="true" />
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23259.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23260.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>08f0d9daf5c5a422b5a22db601ee9fde7068c7ff</Sha>
<Sha>1f8ffd35f5f4af2fd1c309c36f4dfcf7cffda4f6</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23259.5">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23260.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>08f0d9daf5c5a422b5a22db601ee9fde7068c7ff</Sha>
<Sha>1f8ffd35f5f4af2fd1c309c36f4dfcf7cffda4f6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23259.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23260.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>08f0d9daf5c5a422b5a22db601ee9fde7068c7ff</Sha>
<Sha>1f8ffd35f5f4af2fd1c309c36f4dfcf7cffda4f6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23226.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
@ -228,9 +228,9 @@
<Sha>47c52dd2ebf9edfd40abdcff999c13eb461f6ce2</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23256.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23259.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>40d8321047961765c1f4ff62070e4fc72e7b48c4</Sha>
<Sha>d1dd46c475ca2599bcbb1637548b0be2513b83c3</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>

8
eng/Versions.props
View file

@ -33,7 +33,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23259.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23260.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->
@ -78,9 +78,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.5.23260.32</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.100-preview.5.23260.32</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.5.23260.32</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.5.23261.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.100-preview.5.23261.1</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.5.23261.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23259.5",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23259.5"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23260.3",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23260.3"
}
}