Skip to content

Commit 9688ea3

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge branch 'release/9.0.1xx' into darc-release/9.0.1xx-13d352c8-bb8b-4adc-9c2e-6f026d4ceaf2
2 parents fbc6e6c + e39fc8c commit 9688ea3

23 files changed

+244
-338
lines changed

‎.vsts-ci.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@ resources:
5757
ref: refs/tags/release
5858

5959
extends:
60-
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
61-
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
62-
${{ else }}:
63-
template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
60+
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
6461
parameters:
6562
containers:
6663
alpine319WithNode:

‎NuGet.config

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,20 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-deployment-tools -->
77
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-9/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-8/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-7/nuget/v3/index.json" />
11+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-6/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-5/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-4/nuget/v3/index.json" />
814
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-3/nuget/v3/index.json" />
915
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-2/nuget/v3/index.json" />
16+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-15" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-15/nuget/v3/index.json" />
17+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-14" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-14/nuget/v3/index.json" />
18+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-13" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-13/nuget/v3/index.json" />
19+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-12" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-12/nuget/v3/index.json" />
20+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-11/nuget/v3/index.json" />
21+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-10/nuget/v3/index.json" />
1022
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-1/nuget/v3/index.json" />
1123
<!-- End: Package sources from dotnet-deployment-tools -->
1224
<!-- Begin: Package sources from dotnet-aspire -->
@@ -34,7 +46,7 @@
3446
<add key="darc-int-dotnet-aspnetcore-4442a18-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4442a188-1/nuget/v3/index.json" />
3547
<!-- End: Package sources from dotnet-aspnetcore -->
3648
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
37-
<add key="darc-pub-DotNet-msbuild-Trusted-90b52dd-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-90b52dda-1/nuget/v3/index.json" />
49+
<add key="darc-pub-DotNet-msbuild-Trusted-f7ab67b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-f7ab67b0/nuget/v3/index.json" />
3850
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3951
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
4052
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -45,8 +57,20 @@
4557
<!-- End: Package sources from dotnet-runtime -->
4658
<!-- Begin: Package sources from dotnet-templating -->
4759
<add key="darc-pub-dotnet-templating-f46c70a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab/nuget/v3/index.json" />
60+
<add key="darc-pub-dotnet-templating-f46c70a-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-9/nuget/v3/index.json" />
61+
<add key="darc-pub-dotnet-templating-f46c70a-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-8/nuget/v3/index.json" />
62+
<add key="darc-pub-dotnet-templating-f46c70a-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-7/nuget/v3/index.json" />
63+
<add key="darc-pub-dotnet-templating-f46c70a-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-6/nuget/v3/index.json" />
64+
<add key="darc-pub-dotnet-templating-f46c70a-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-5/nuget/v3/index.json" />
65+
<add key="darc-pub-dotnet-templating-f46c70a-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-4/nuget/v3/index.json" />
4866
<add key="darc-pub-dotnet-templating-f46c70a-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-3/nuget/v3/index.json" />
4967
<add key="darc-pub-dotnet-templating-f46c70a-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-2/nuget/v3/index.json" />
68+
<add key="darc-pub-dotnet-templating-f46c70a-15" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-15/nuget/v3/index.json" />
69+
<add key="darc-pub-dotnet-templating-f46c70a-14" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-14/nuget/v3/index.json" />
70+
<add key="darc-pub-dotnet-templating-f46c70a-13" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-13/nuget/v3/index.json" />
71+
<add key="darc-pub-dotnet-templating-f46c70a-12" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-12/nuget/v3/index.json" />
72+
<add key="darc-pub-dotnet-templating-f46c70a-11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-11/nuget/v3/index.json" />
73+
<add key="darc-pub-dotnet-templating-f46c70a-10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-10/nuget/v3/index.json" />
5074
<add key="darc-pub-dotnet-templating-f46c70a-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-1/nuget/v3/index.json" />
5175
<!-- End: Package sources from dotnet-templating -->
5276
<!-- Begin: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,18 @@
7373
<Sha>4c9d1b112c16716c2479e054e9ad4db8b5b8c70c</Sha>
7474
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build" Version="17.12.24">
76+
<Dependency Name="Microsoft.Build" Version="17.12.26">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>90b52dda697be7d9b07b90b3a7eb7a80b433ef09</Sha>
78+
<Sha>f7ab67b00991bd693a518451426ba33915614d19</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Build.Localization" Version="17.12.24-preview-25066-04">
80+
<Dependency Name="Microsoft.Build.Localization" Version="17.12.26-preview-25071-08">
8181
<Uri>https://github.com/dotnet/msbuild</Uri>
82-
<Sha>90b52dda697be7d9b07b90b3a7eb7a80b433ef09</Sha>
82+
<Sha>f7ab67b00991bd693a518451426ba33915614d19</Sha>
8383
</Dependency>
8484
<!-- Intermediate is necessary for source build. -->
85-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.24-preview-25066-04">
85+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.26-preview-25071-08">
8686
<Uri>https://github.com/dotnet/msbuild</Uri>
87-
<Sha>90b52dda697be7d9b07b90b3a7eb7a80b433ef09</Sha>
87+
<Sha>f7ab67b00991bd693a518451426ba33915614d19</Sha>
8888
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8989
</Dependency>
9090
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.101-beta.24602.3">
@@ -631,14 +631,14 @@
631631
<Uri>https://github.com/dotnet/arcade-services</Uri>
632632
<Sha>47e3672c762970073e4282bd563233da86bcca3e</Sha>
633633
</Dependency>
634-
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25061.2">
634+
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25102.1">
635635
<Uri>https://github.com/dotnet/scenario-tests</Uri>
636-
<Sha>1512fd86b0eb245fe6d8efd7e833c37f5e290803</Sha>
636+
<Sha>008b3a357044b102ec30e15ac381c2e880f573af</Sha>
637637
</Dependency>
638638
<!-- Intermediate is necessary for source build. -->
639-
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25061.2">
639+
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25102.1">
640640
<Uri>https://github.com/dotnet/scenario-tests</Uri>
641-
<Sha>1512fd86b0eb245fe6d8efd7e833c37f5e290803</Sha>
641+
<Sha>008b3a357044b102ec30e15ac381c2e880f573af</Sha>
642642
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
643643
</Dependency>
644644
<!--

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<VersionMajor>9</VersionMajor>
77
<VersionMinor>0</VersionMinor>
88
<VersionSDKMinor>1</VersionSDKMinor>
9-
<VersionFeature>03</VersionFeature>
9+
<VersionFeature>04</VersionFeature>
1010
<!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
1111
It should always be the hundreds-value of the current SDK version, never any
1212
preview version components or anything else. E.g. 8.0.100, 9.0.300, etc. -->
@@ -180,8 +180,8 @@
180180
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
181181
182182
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
183-
<MicrosoftBuildVersion>17.12.24</MicrosoftBuildVersion>
184-
<MicrosoftBuildLocalizationVersion>17.12.24-preview-25066-04</MicrosoftBuildLocalizationVersion>
183+
<MicrosoftBuildVersion>17.12.26</MicrosoftBuildVersion>
184+
<MicrosoftBuildLocalizationVersion>17.12.26-preview-25071-08</MicrosoftBuildLocalizationVersion>
185185
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
186186
<MinimumVSVersion>17.12</MinimumVSVersion>
187187
</PropertyGroup>
@@ -261,7 +261,7 @@
261261
<PropertyGroup Label="Infrastructure and test only dependencies">
262262
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
263263
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
264-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25061.2</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
264+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25102.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
265265
</PropertyGroup>
266266
<PropertyGroup Label="Manually updated">
267267
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

‎eng/install-scancode.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ 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.2.1"
8+
SCANCODE_VERSION="32.3.2"
99

1010
pyEnvPath="/tmp/scancode-env"
1111
python3 -m venv $pyEnvPath

‎src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- job: Setup
4343
pool:
4444
name: NetCore1ESPool-Svc-Internal
45-
demands: ImageOverride -equals 1es-ubuntu-2004
45+
demands: ImageOverride -equals 1es-ubuntu-2204
4646
steps:
4747
- script: |
4848
vmrSrcDir="$(Build.SourcesDirectory)/src"
@@ -77,7 +77,7 @@ jobs:
7777
dependsOn: Setup
7878
pool:
7979
name: NetCore1ESPool-Svc-Internal
80-
demands: ImageOverride -equals 1es-ubuntu-2004
80+
demands: ImageOverride -equals 1es-ubuntu-2204
8181
timeoutInMinutes: 420
8282
strategy:
8383
matrix: $[ dependencies.Setup.outputs['GetMatrix.matrix'] ]
@@ -163,7 +163,7 @@ jobs:
163163
condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release'))
164164
pool:
165165
name: NetCore1ESPool-Svc-Internal
166-
demands: ImageOverride -equals 1es-ubuntu-2004
166+
demands: ImageOverride -equals 1es-ubuntu-2204
167167
variables:
168168
- template: templates/variables/pipelines.yml
169169
steps:

‎src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public class LicenseScanTests : TestBase
5656
"bsd-original", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/bsd-original.LICENSE
5757
"bsd-original-uc", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/bsd-original-uc.LICENSE
5858
"bsd-simplified", // https://opensource.org/license/bsd-2-clause/
59+
"bsd-zero", // https://opensource.org/license/0bsd/
5960
"bytemark", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/bytemark.LICENSE
6061
"bzip2-libbzip-2010", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/bzip2-libbzip-2010.LICENSE
6162
"cc0-1.0", // https://creativecommons.org/publicdomain/zero/1.0/legalcode
@@ -101,6 +102,7 @@ public class LicenseScanTests : TestBase
101102
"sax-pd", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/sax-pd.LICENSE
102103
"unicode", // https://opensource.org/license/unicode-inc-license-agreement-data-files-and-software/
103104
"unicode-mappings", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/unicode-mappings.LICENSE
105+
"unlicense", // https://opensource.org/license/unlicense/
104106
"uoi-ncsa", // https://opensource.org/license/uoi-ncsa-php/
105107
"w3c-software-19980720", // https://opensource.org/license/w3c/
106108
"w3c-software-doc-20150513", // https://opensource.org/license/w3c/

‎src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests/LicenseExclusions.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ src/diagnostics/THIRD-PARTY-NOTICES.TXT|codesourcery-2004
6666

6767
# False positive
6868
src/efcore/test/EfCore.Tests/ChangeTracking/ComplexPropertyEntryTest.cs|proprietary-license
69+
src/efcore/test/EFCore.Tests/ChangeTracking/EntityEntryTest.cs|proprietary-license
6970
src/efcore/test/EfCore.Tests/ChangeTracking/MemberEntryTest.cs|proprietary-license
71+
src/efcore/test/EFCore.Tests/ChangeTracking/PropertyEntryTest.cs|proprietary-license
7072

7173
#
7274
# fsharp
@@ -75,6 +77,9 @@ src/efcore/test/EfCore.Tests/ChangeTracking/MemberEntryTest.cs|proprietary-licen
7577
# Applies to installer, not source
7678
src/fsharp/setup/resources/eula/*.rtf
7779

80+
# False positive
81+
src/fsharp/tests/fsharp/core/members/ops/THIRD-PARTY-NOTICES.TXT|unknown-license-reference
82+
7883
#
7984
# msbuild
8085
#
@@ -106,6 +111,7 @@ src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/DefaultManifestValue
106111
src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/LicenseExpressionTokenizerTests.cs
107112
src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/NuGetLicenseExpressionParserTests.cs
108113
src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/NuGetLicenseTests.cs
114+
src/nuget-client/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/PackCommandTests.cs|389-exception
109115
src/nuget-client/test/TestUtilities/Test.Utility/JsonData.cs
110116

111117
#
@@ -245,11 +251,12 @@ src/wpf/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FontE
245251
src/wpf/eng/WpfArcadeSdk/tools/AvTrace/GenTraceSources.pl|proprietary-license
246252
src/wpf/eng/WpfArcadeSdk/tools/GenXmlStringTable.pl|proprietary-license
247253

248-
# False positive - https://github.com/dotnet/source-build/issues/4373
254+
# False positive
249255
src/wpf/src/Microsoft.DotNet.Wpf/src/PresentationUI/MS/Internal/Documents/RMPublishingDialog.RightsTable.cs|unknown-license-reference
250256
src/wpf/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/WindowBackdropType.cs|bsd-2-clause-views
251257
src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/*.xaml|bsd-2-clause-views
252258
src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/*.xaml|bsd-2-clause-views
253259
src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/*.xaml|bsd-2-clause-views
254260
src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/*.xaml|mpl-2.0
255261
src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/*.xaml|bsd-2-clause-views
262+
src/wpf/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/CompoundFile/RightsManagementEncryptionTransform.cs|proprietary-license

‎test/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void CanBuildProjectWithPackageReferencesWithConflictingTypes()
3939
var testAsset = _testAssetsManager.CreateTestProject(testProject);
4040

4141
var packagesPaths = packageReferences.Select(e => Path.GetDirectoryName(e.NupkgPath));
42-
List<string> sources = new() { NuGetConfigWriter.DotnetCoreBlobFeed };
42+
List<string> sources = new();
4343
sources.AddRange(packagesPaths);
4444
NuGetConfigWriter.Write(testAsset.TestRoot, sources);
4545

@@ -85,7 +85,7 @@ public void CanBuildProjectWithMultiplePackageReferencesWithAliases()
8585
testProject.SourceFiles[$"{testProject.Name}.cs"] = ClassLibAandBUsage;
8686
var testAsset = _testAssetsManager.CreateTestProject(testProject);
8787

88-
List<string> sources = new() { NuGetConfigWriter.DotnetCoreBlobFeed, Path.GetDirectoryName(packageReferenceA.NupkgPath), Path.GetDirectoryName(packageReferenceB.NupkgPath) };
88+
List<string> sources = new() { Path.GetDirectoryName(packageReferenceA.NupkgPath), Path.GetDirectoryName(packageReferenceB.NupkgPath) };
8989
NuGetConfigWriter.Write(testAsset.TestRoot, sources);
9090

9191
var buildCommand = new BuildCommand(testAsset)
@@ -122,7 +122,7 @@ public void CanBuildProjectWithAPackageReferenceWithMultipleAliases()
122122
testProject.SourceFiles[$"{testProject.Name}.cs"] = ClassLibAandBUsage;
123123
var testAsset = _testAssetsManager.CreateTestProject(testProject);
124124

125-
List<string> sources = new() { NuGetConfigWriter.DotnetCoreBlobFeed, Path.GetDirectoryName(packageReferenceA.NupkgPath) };
125+
List<string> sources = new() { Path.GetDirectoryName(packageReferenceA.NupkgPath) };
126126
NuGetConfigWriter.Write(testAsset.TestRoot, sources);
127127

128128
var buildCommand = new BuildCommand(testAsset)

‎test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ private void It_targets_the_right_framework(
133133

134134
var testAsset = _testAssetsManager.CreateTestProject(testProject, testIdentifier);
135135

136-
NuGetConfigWriter.Write(testAsset.TestRoot, NuGetConfigWriter.DotnetCoreBlobFeed);
136+
NuGetConfigWriter.Write(testAsset.TestRoot);
137137

138138
var buildCommand = new BuildCommand(testAsset);
139139

0 commit comments

Comments
 (0)