Skip to content

Commit 2c76aef

Browse files
mmitchemmitche
committed
Merge remote-tracking branch 'upstream/release/6.0' into merge-internal/release/6.0
2 parents fce3362 + 0ecd7d7 commit 2c76aef

File tree

6 files changed

+18
-20
lines changed

6 files changed

+18
-20
lines changed

‎NuGet.config

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-dd7c928" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dd7c9283/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-runtime-5a400c2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5a400c21/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-5a400c2-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5a400c21-2/nuget/v3/index.json" />
107
<!-- End: Package sources from dotnet-runtime -->
118
<!-- Begin: Package sources from dotnet-efcore -->
12-
<add key="darc-int-dotnet-efcore-1c3cdab" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-1c3cdab6/nuget/v3/index.json" />
139
<!-- End: Package sources from dotnet-efcore -->
1410
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1511
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -29,12 +25,8 @@
2925
<clear />
3026
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3127
<!-- Begin: Package sources from dotnet-efcore -->
32-
<add key="darc-int-dotnet-efcore-1c3cdab" value="true" />
3328
<!-- End: Package sources from dotnet-efcore -->
3429
<!-- Begin: Package sources from dotnet-runtime -->
35-
<add key="darc-int-dotnet-runtime-5a400c2-2" value="true" />
36-
<add key="darc-int-dotnet-runtime-5a400c2" value="true" />
37-
<add key="darc-int-dotnet-runtime-dd7c928" value="true" />
3830
<!-- End: Package sources from dotnet-runtime -->
3931
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4032
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,22 +280,22 @@
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281281
<Sha>5a400c212afdf8e675c9a1d38442e6d2f19f7b74</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22463.7">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22512.3">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
285+
<Sha>bb1e72113a7eaf8bebda940beba8cf8bee1b453f</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22463.7">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22512.3">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
290+
<Sha>bb1e72113a7eaf8bebda940beba8cf8bee1b453f</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22463.7">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22512.3">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
294+
<Sha>bb1e72113a7eaf8bebda940beba8cf8bee1b453f</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22463.7">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22512.3">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
298+
<Sha>bb1e72113a7eaf8bebda940beba8cf8bee1b453f</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<MicrosoftEntityFrameworkCoreVersion>6.0.11</MicrosoftEntityFrameworkCoreVersion>
132132
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.11</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22463.7</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22463.7</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22512.3</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22512.3</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138

‎eng/common/build.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Param(
2626
[string] $runtimeSourceFeed = '',
2727
[string] $runtimeSourceFeedKey = '',
2828
[switch] $excludePrereleaseVS,
29+
[switch] $nativeToolsOnMachine,
2930
[switch] $help,
3031
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
3132
)
@@ -67,6 +68,7 @@ function Print-Usage() {
6768
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
6869
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
6970
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
71+
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
7072
Write-Host ""
7173

7274
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -146,6 +148,9 @@ try {
146148
$nodeReuse = $false
147149
}
148150

151+
if ($nativeToolsOnMachine) {
152+
$env:NativeToolsOnMachine = $true
153+
}
149154
if ($restore) {
150155
InitializeNativeTools
151156
}

‎eng/common/init-tools-native.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ try {
112112
$ToolPath = Convert-Path -Path $BinPath
113113
Write-Host "Adding $ToolName to the path ($ToolPath)..."
114114
Write-Host "##vso[task.prependpath]$ToolPath"
115+
$env:PATH = "$ToolPath;$env:PATH"
115116
$InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
116117
}
117118
}

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"msbuild-sdks": {
3131
"Yarn.MSBuild": "1.22.10",
32-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7",
33-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22463.7"
32+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22512.3",
33+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22512.3"
3434
}
3535
}

0 commit comments

Comments
 (0)