Skip to content

Commit c46aa0c

Browse files
nagilsonnagilson
committed
Merge branch 'nagilson/disable-containers-reg' of https://github.com/nagilson/sdk into nagilson/disable-containers-reg
2 parents d798500 + 8f3f194 commit c46aa0c

File tree

33 files changed

+346
-318
lines changed

33 files changed

+346
-318
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.24367.3",
6+
"version": "1.1.0-beta.25317.4",
77
"commands": [
88
"darc"
99
]

‎NuGet.config

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,24 @@
2424
<!-- Begin: Package sources from dotnet-aspire -->
2525
<!-- End: Package sources from dotnet-aspire -->
2626
<!-- Begin: Package sources from dotnet-emsdk -->
27+
<add key="darc-pub-dotnet-emsdk-b567cdb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b567cdb6/nuget/v3/index.json" />
2728
<!-- End: Package sources from dotnet-emsdk -->
2829
<!-- Begin: Package sources from dotnet-aspnetcore -->
30+
<add key="darc-int-dotnet-aspnetcore-f6b3a5d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f6b3a5da/nuget/v3/index.json" />
2931
<!-- End: Package sources from dotnet-aspnetcore -->
3032
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
31-
<add key="darc-pub-DotNet-msbuild-Trusted-6c6276d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6c6276d5/nuget/v3/index.json" />
33+
<add key="darc-pub-DotNet-msbuild-Trusted-9dcc26a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-9dcc26a5/nuget/v3/index.json" />
3234
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3335
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3436
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3537
<!-- Begin: Package sources from dotnet-runtime -->
38+
<add key="darc-int-dotnet-runtime-3c298d9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3c298d9f/nuget/v3/index.json" />
3639
<!-- End: Package sources from dotnet-runtime -->
3740
<!-- Begin: Package sources from dotnet-templating -->
38-
<add key="darc-pub-dotnet-templating-088027f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-088027fb/nuget/v3/index.json" />
41+
<add key="darc-pub-dotnet-templating-861f0ec" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3/nuget/v3/index.json" />
3942
<!-- End: Package sources from dotnet-templating -->
4043
<!-- Begin: Package sources from dotnet-windowsdesktop -->
44+
<add key="darc-int-dotnet-windowsdesktop-bd9e6e9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-bd9e6e96/nuget/v3/index.json" />
4145
<!-- End: Package sources from dotnet-windowsdesktop -->
4246
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4347
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -64,12 +68,15 @@
6468
<!-- Begin: Package sources from dotnet-templating -->
6569
<!-- End: Package sources from dotnet-templating -->
6670
<!-- Begin: Package sources from dotnet-aspnetcore -->
71+
<add key="darc-int-dotnet-aspnetcore-f6b3a5d" value="true" />
6772
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
6873
<!-- End: Package sources from DotNet-msbuild-Trusted -->
6974
<!-- End: Package sources from dotnet-aspnetcore -->
7075
<!-- Begin: Package sources from dotnet-runtime -->
76+
<add key="darc-int-dotnet-runtime-3c298d9" value="true" />
7177
<!-- End: Package sources from dotnet-runtime -->
7278
<!-- Begin: Package sources from dotnet-windowsdesktop -->
79+
<add key="darc-int-dotnet-windowsdesktop-bd9e6e9" value="true" />
7380
<!-- End: Package sources from dotnet-windowsdesktop -->
7481
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
7582
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 168 additions & 168 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 71 additions & 71 deletions
Large diffs are not rendered by default.

‎eng/common/core-templates/job/job.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ jobs:
134134
signType: $(_SignType)
135135
zipSources: false
136136
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
137+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
138+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
139+
${{ else }}:
140+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
137141
env:
138142
TeamName: $(_TeamName)
139143
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'

‎eng/common/internal/NuGet.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@
44
<clear />
55
<add key="dotnet-core-internal-tooling" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json" />
66
</packageSources>
7+
<packageSourceMapping>
8+
<clear />
9+
</packageSourceMapping>
710
</configuration>

‎eng/install-scancode.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ set -euo pipefail
55
# Install instructions: https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-as-a-library-via-pip
66

77
# See latest release at https://github.com/nexB/scancode-toolkit/releases
8-
SCANCODE_VERSION="32.3.3"
8+
SCANCODE_VERSION="32.4.0"
99

1010
pyEnvPath="/tmp/scancode-env"
1111
python3 -m venv $pyEnvPath
1212
source $pyEnvPath/bin/activate
1313
pip install scancode-toolkit==$SCANCODE_VERSION
14-
pip install click==8.1.8
1514
deactivate
1615

1716
# Setup a script which executes scancode in the virtual environment

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.106",
3+
"dotnet": "9.0.107",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25302.2",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25325.4",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<PackageReference Include="System.Text.Json" ExcludeAssets="runtime">
4949
<!-- For the net472 flavor, lock back to a System.Text.Json equal to or older than MSBuild will provide
5050
so it doesn't have to be redistributed. -->
51-
<VersionOverride Condition="'$(TargetFramework)' == 'net472'">8.0.3</VersionOverride>
51+
<VersionOverride Condition="'$(TargetFramework)' == 'net472'">8.0.5</VersionOverride>
5252
</PackageReference>
5353
</ItemGroup>
5454

‎src/Layout/tool_fsharp/tool_fsc.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77

88
<ItemGroup>
99
<PackageReference Include="Microsoft.FSharp.Compiler" ExcludeAssets="contentFiles" GeneratePathProperty="true" />
10-
<PackageReference Include="Microsoft.Build.Framework" />
11-
<PackageReference Include="Microsoft.Build.Tasks.Core" />
12-
<PackageReference Include="Microsoft.Build.Utilities.Core" />
10+
<PackageReference Include="Microsoft.Build.Framework" VersionOverride="$(MicrosoftBuildCurrentPackageVersion)" />
11+
<PackageReference Include="Microsoft.Build.Tasks.Core" VersionOverride="$(MicrosoftBuildCurrentPackageVersion)" />
12+
<PackageReference Include="Microsoft.Build.Utilities.Core" VersionOverride="$(MicrosoftBuildCurrentPackageVersion)" />
13+
<PackageReference Include="Microsoft.NET.StringTools" VersionOverride="$(MicrosoftBuildCurrentPackageVersion)" />
1314
</ItemGroup>
1415

1516
<Target Name="_ResolvePublishNuGetPackagePdbsAndXml"

0 commit comments

Comments
 (0)