Fix Build issue

joriverm · May 8, 2024 · 1cfc3db · 1cfc3db
1 parent cbfd387
commit 1cfc3db
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 47 deletions.
diff --git a/eng/pipelines/build-core-lib.yml b/eng/pipelines/build-core-lib.yml
@@ -147,19 +147,6 @@ extends:
             version: 8.0.x
             includePreviewVersions: true
 
-        # Install nodejs
-        - task: NodeTool@0
-          displayName: 'Install NodeJS'
-          inputs:
-            versionSpec: '20.x'
-
-        # Authenticate to npm
-        - task: Npm@1
-          displayName: "NPM install"
-          inputs:
-            command: "install"
-            workingDir: "src/Core.Assets"
-
         # Set version number (exclude some folders)
         - task: PowerShell@2
           displayName: 'Versioning $(Build.BuildNumber)'
@@ -172,19 +159,21 @@ extends:
               -assemblyVersion "$(AssemblyVersion)"
               -packageVersion "$(PackageVersion)"
 
-        # NuGet Authenticate
-        - task: NuGetAuthenticate@1
-          displayName: 'Authenticate to AzDO Feeds'
-
         # Restore packages
         - task: DotNetCoreCLI@2
           displayName: Restore packages
           inputs:
-            feedsToUse: config
-            nugetConfigPath: '$(System.DefaultWorkingDirectory)/NuGet.config'
-            includeNuGetOrg: false
             command: 'restore'
             projects: ${{ parameters.Projects }}
+            feedsToUse: config
+            nugetConfigPath: nuget.config
+
+        # NPM install Core.Assets
+        - task: Npm@1
+          displayName: "NPM install Core.Assets"
+          inputs:
+            command: "install"
+            workingDir: "src/Core.Assets"
 
         # Build the projects
         - task: DotNetCoreCLI@2
@@ -240,7 +229,7 @@ extends:
             solution: 'Microsoft.FluentUI.signproj'
             msbuildArguments: '/p:OutDir=$(Build.ArtifactStagingDirectory)\ /p:IntermediateOutputPath=$(Build.ArtifactStagingDirectory)\sign\'
 
-
+        # Copy signed packages
         - task: CopyFiles@2
           displayName: 'Copy signed packages to pickup folder'
           inputs:

diff --git a/nuget.config b/nuget.config
@@ -1,29 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-	<packageSources>
-		<clear />
-		<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
-		<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
-		<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
-		<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
-		<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
-		<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
-		<!-- Used for the Rich Navigation indexing task -->
-		<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
-	</packageSources>
-	<packageSourceMapping>
-		<packageSource key="dotnet-public">
-			<package pattern="*" />
-		</packageSource>
-		<packageSource key="dotnet8">
-			<package pattern="*" />
-		</packageSource>
-		<packageSource key="dotnet-libraries">
-			<package pattern="System.CommandLine" />
-		</packageSource>
-		<packageSource key="dotnet-eng">
-			<package pattern="*" />
-		</packageSource>
-	</packageSourceMapping>
+  <packageSources>
+    <clear />
+    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
+  </packageSources>
 </configuration>
-