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

Merge branch 'main' into darc-main-817315bd-ca8d-4e8e-9a2e-b14bfc73bc22

Browse source
This commit is contained in:
Noah Gilson 2023-05-09 11:33:53 -07:00 • committed by GitHub
commit 7c66265865
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
eng/Version.Details.xml
View file

@ -193,18 +193,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23255.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23259.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5dff25b814b90abb85c847ed274cf4afb2c1b276</Sha>
<Sha>833d08dde7eca1590731085b73245a81de96bd10</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23255.2">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23259.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5dff25b814b90abb85c847ed274cf4afb2c1b276</Sha>
<Sha>833d08dde7eca1590731085b73245a81de96bd10</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23255.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23259.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5dff25b814b90abb85c847ed274cf4afb2c1b276</Sha>
<Sha>833d08dde7eca1590731085b73245a81de96bd10</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.23253.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23256.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>513000e77df5ec1f9b86397d8df6e3254703c636</Sha>
<Sha>40d8321047961765c1f4ff62070e4fc72e7b48c4</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.23255.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23259.1</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.23255.2",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23255.2"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23259.1",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23259.1"
}
}

4
src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt
View file

@ -11,10 +11,6 @@
<File Path="Microsoft.DotNet.ILCompiler.x.y.z/tools/netstandard/System.Reflection.Metadata.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="Microsoft.TestPlatform.CLI.x.y.z/contentFiles/any/netx.y/Microsoft.CodeCoverage.IO.dll">
<Type>Hash, AssemblyAttribute</Type>
<Match Package="/vmr/prereqs/packages/prebuilt/Microsoft.CodeCoverage.IO.x.y.z" PackageId="Microsoft.CodeCoverage.IO" PackageVersion="x.y.z" File="lib/netstandard2.0/Microsoft.CodeCoverage.IO.dll" />
</File>
<File Path="Microsoft.TestPlatform.CLI.x.y.z/contentFiles/any/netx.y/System.ComponentModel.Composition.dll">
<Type>Hash, AssemblyAttribute</Type>
<Match Package="/vmr/prereqs/packages/prebuilt/microsoft.internal.testplatform.remote.x.y.z.297.nupkg" PackageId="Microsoft.Internal.TestPlatform.Remote" PackageVersion="x.y.z.297" File="tools/netstandard/Extensions/System.ComponentModel.Composition.dll" />