Skip to content

Commit 03f2290

Browse files
[main] Source code updates from dotnet/dotnet (#1272)
* [VMR] Codeflow be8cb62-5525c4c [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 271975 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25315.102 -> 10.0.0-beta.25316.103) Microsoft.DotNet.GenAPI.Task (Version 10.0.100-preview.6.25315.102 -> 10.0.100-preview.6.25316.103) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 5525c4c commit 03f2290

File tree

6 files changed

+15
-7
lines changed

6 files changed

+15
-7
lines changed

Directory.Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
<CustomizationsPropsFile>$(CustomizationsPrefix).props</CustomizationsPropsFile>
1616
<CustomizationsSourceFile>$(CustomizationsPrefix).cs</CustomizationsSourceFile>
1717

18+
<ArtifactsReferenceOnlyPackagesDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsPackagesDir)','ReferenceOnly'))</ArtifactsReferenceOnlyPackagesDir>
19+
1820
<!-- Only upgrade NuGetAudit warnings to errors for official builds. -->
1921
<WarningsNotAsErrors Condition="'$(OfficialBuild)' != 'true'">$(WarningsNotAsErrors);NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
2022
</PropertyGroup>

eng/Version.Details.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="be8cb623e031f933b5b62e82d37094b4981dce30" BarId="271836" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="20343176cfd35b56036dc4ca9d9ddd2a201a4e92" BarId="271975" />
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25315.102">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25316.103">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
7+
<Sha>20343176cfd35b56036dc4ca9d9ddd2a201a4e92</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-preview.6.25315.102">
9+
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-preview.6.25316.103">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
11+
<Sha>20343176cfd35b56036dc4ca9d9ddd2a201a4e92</Sha>
1212
</Dependency>
1313
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-preview.4.20202.18">
1414
<Uri>https://github.com/dotnet/runtime</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILAsmVersion>
1818
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILDAsmVersion>
1919
<!-- SDK dependencies -->
20-
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-preview.6.25315.102</MicrosoftDotNetGenAPITaskPackageVersion>
20+
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-preview.6.25316.103</MicrosoftDotNetGenAPITaskPackageVersion>
2121
<!-- xUnit dependencies -->
2222
<XunitSkippableFactVersion>1.4.13</XunitSkippableFactVersion>
2323
</PropertyGroup>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "10.0.100-preview.6.25302.104"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25315.102",
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25316.103",
77
"Microsoft.Build.NoTargets": "3.7.0"
88
}
99
}

src/referencePackages/Directory.Build.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<LangVersion>latest</LangVersion>
3535

3636
<CommonSrc>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'common'))</CommonSrc>
37+
38+
<IsShippingPackage>false</IsShippingPackage>
39+
<ArtifactsNonShippingPackagesDir>$(ArtifactsReferenceOnlyPackagesDir)</ArtifactsNonShippingPackagesDir>
3740
</PropertyGroup>
3841

3942
<PropertyGroup>

src/targetPacks/Directory.Build.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414

1515
<RestoreIlTooling>true</RestoreIlTooling>
1616

17+
<IsShippingPackage>false</IsShippingPackage>
18+
<ArtifactsNonShippingPackagesDir>$(ArtifactsReferenceOnlyPackagesDir)</ArtifactsNonShippingPackagesDir>
19+
1720
<!-- Disable NU5131: unclear warning caused by ref-only (https://github.com/NuGet/Home/issues/8684) -->
1821
<NoWarn>$(NoWarn);NU5131</NoWarn>
1922
<!-- Don't warn on NU5125 - The 'licenseUrl' element will be deprecated. -->

0 commit comments

Comments
 (0)