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

Merge branch 'main' into darc-main-b3493948-ba4e-418f-85b9-c4d9e5a8b57d

Browse source
This commit is contained in:
Larry Ewing 2023-05-15 09:48:05 -05:00 committed by GitHub
commit 8294125182
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
eng/Version.Details.xml
View file

@ -181,9 +181,9 @@
<Sha>9e870996b8bf0b91a791edd1039bfd23bdd01af8</Sha>
<SourceBuild RepoName="deployment-tools" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23260.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23262.1">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>5661eb3d593b2150fb7e153ee31282722098690a</Sha>
<Sha>a1460948fd0a4ab66b885c1575b085af70139e9a</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.1.0-beta.23253.1">
@ -193,18 +193,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23262.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23262.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>933cf300e376f398e3fa3b3563a6ad5fe32a511e</Sha>
<Sha>1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23262.1">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23262.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>933cf300e376f398e3fa3b3563a6ad5fe32a511e</Sha>
<Sha>1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23262.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23262.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>933cf300e376f398e3fa3b3563a6ad5fe32a511e</Sha>
<Sha>1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4</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.23259.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23261.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>d1dd46c475ca2599bcbb1637548b0be2513b83c3</Sha>
<Sha>a0391b3beff0696561189b5881f8af3b651d64ac</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>

2
eng/Versions.props
View file

@ -33,7 +33,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23262.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23262.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

4
global.json
View file

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

15
src/SourceBuild/content/NuGet.config Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This empty NuGet.config at the root of the repo ensures that a global/default one
(referencing nuget.org) is not used by accident.
The individual repo NuGet.config files are utilized during the build.
-->
<configuration>
<packageSources>
<clear />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
</disabledPackageSources>
</configuration>

4
src/VirtualMonoRepo/source-mappings.json
View file

@ -144,7 +144,9 @@
"src/humanizer/samples/**/*.js",
"src/application-insights/**/*.exe",
"src/application-insights/**/*.dll",
"src/application-insights/**/*.zip"
"src/application-insights/**/*.zip",
"src/application-insights/**/NuGet.config",
"src/newtonsoft-json/**/NuGet.Config"
]
},
{