diff --git a/NuGet.Config b/NuGet.Config deleted file mode 100644 index 7e49cd0..0000000 --- a/NuGet.Config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml b/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml index e1ac87c..cdc4fef 100644 --- a/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml +++ b/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml @@ -30,6 +30,7 @@ variables: GDK_EDITION: $(GDKEditionNumber) URL_FEED: $(ADOFeedURL) GameDKLatest: '$(ExtractedFolder)\GDK\Microsoft.gdk.xbox.$(GDKEditionNumber)\native\$(GDKEditionNumber)\' + skipNugetSecurityAnalysis: true # We explicitly call this task so we don't need it to be auto-injected pool: vmImage: windows-2022 @@ -45,23 +46,29 @@ jobs: displayName: 'Use NuGet' inputs: versionSpec: '6.5.x' + - task: PowerShell@2 + displayName: 'Create nuget.config with single source' + inputs: + targetType: inline + script: | + $xml = @' + + + + + + + '@ + $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config" + - task: NuGetCommand@2 # We have to use a nuget.config to provide the feed for the 'nuget install' option. displayName: 'NuGet set package source to ADO feed' inputs: command: custom - arguments: sources add -Name xboxgdk-DirectXTex -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config - - task: PowerShell@2 - displayName: 'Set nuget.config to single source' - inputs: - targetType: inline - script: | - $file = '.\NuGet.Config' - $doc = [xml](Get-Content $file) - $newelement = $doc.CreateElement("clear") - $clearadd = $doc.configuration.packageSources.PrependChild($newelement) - $doc.OuterXml | Set-Content $file - + arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config + - task: nuget-security-analysis@0 + displayName: 'Secure Supply Chain Analysis' - task: NuGetCommand@2 displayName: NuGet install PGDK inputs: diff --git a/build/DirectXTex-GitHub-CMake-Xbox.yml b/build/DirectXTex-GitHub-CMake-Xbox.yml index efd3ee0..1493e29 100644 --- a/build/DirectXTex-GitHub-CMake-Xbox.yml +++ b/build/DirectXTex-GitHub-CMake-Xbox.yml @@ -43,6 +43,7 @@ variables: GDK_EDITION: $(GDKEditionNumber) URL_FEED: $(ADOFeedURL) GameDKLatest: '$(ExtractedFolder)\GDK\Microsoft.gdk.xbox.$(GDKEditionNumber)\native\$(GDKEditionNumber)\' + skipNugetSecurityAnalysis: true # We explicitly call this task so we don't need it to be auto-injected pool: vmImage: windows-2019 @@ -58,23 +59,29 @@ jobs: displayName: 'Use NuGet' inputs: versionSpec: '6.5.x' + - task: PowerShell@2 + displayName: 'Create nuget.config with single source' + inputs: + targetType: inline + script: | + $xml = @' + + + + + + + '@ + $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config" + - task: NuGetCommand@2 # We have to use a nuget.config to provide the feed for the 'nuget install' option. displayName: 'NuGet set package source to ADO feed' inputs: command: custom - arguments: sources add -Name xboxgdk-DirectXTex -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config - - task: PowerShell@2 - displayName: 'Set nuget.config to single source' - inputs: - targetType: inline - script: | - $file = '.\NuGet.Config' - $doc = [xml](Get-Content $file) - $newelement = $doc.CreateElement("clear") - $clearadd = $doc.configuration.packageSources.PrependChild($newelement) - $doc.OuterXml | Set-Content $file - + arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config + - task: nuget-security-analysis@0 + displayName: 'Secure Supply Chain Analysis' - task: NuGetCommand@2 displayName: NuGet install PGDK inputs: diff --git a/build/DirectXTex-GitHub-GDK-Dev17.yml b/build/DirectXTex-GitHub-GDK-Dev17.yml index 28f1ec1..5da13f5 100644 --- a/build/DirectXTex-GitHub-GDK-Dev17.yml +++ b/build/DirectXTex-GitHub-GDK-Dev17.yml @@ -32,6 +32,7 @@ variables: GDKEnableBWOI: true GITHUB_PAT: $(GITHUBPUBLICTOKEN) URL_FEED: $(ADOFeedURL) + skipNugetSecurityAnalysis: true # We explicitly call this task so we don't need it to be auto-injected jobs: - job: BUILD_GDK @@ -46,23 +47,29 @@ jobs: displayName: 'Use NuGet' inputs: versionSpec: '6.5.x' + - task: PowerShell@2 + displayName: 'Create nuget.config with single source' + inputs: + targetType: inline + script: | + $xml = @' + + + + + + + '@ + $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config" + - task: NuGetCommand@2 # We have to use a nuget.config to provide the feed for the 'nuget install' option. displayName: 'NuGet set package source to ADO feed' inputs: command: custom - arguments: sources add -Name xboxgdk-DirectXTex -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config - - task: PowerShell@2 - displayName: 'Set nuget.config to single source' - inputs: - targetType: inline - script: | - $file = '.\NuGet.Config' - $doc = [xml](Get-Content $file) - $newelement = $doc.CreateElement("clear") - $clearadd = $doc.configuration.packageSources.PrependChild($newelement) - $doc.OuterXml | Set-Content $file - + arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config + - task: nuget-security-analysis@0 + displayName: 'Secure Supply Chain Analysis' - task: NuGetCommand@2 displayName: NuGet install PGDK inputs: diff --git a/build/DirectXTex-GitHub-GDK.yml b/build/DirectXTex-GitHub-GDK.yml index 6d0a843..dd9388c 100644 --- a/build/DirectXTex-GitHub-GDK.yml +++ b/build/DirectXTex-GitHub-GDK.yml @@ -53,6 +53,7 @@ variables: GDKEnableBWOI: true GITHUB_PAT: $(GITHUBPUBLICTOKEN) URL_FEED: $(ADOFeedURL) + skipNugetSecurityAnalysis: true # We explicitly call this task so we don't need it to be auto-injected jobs: - job: BUILD_GDK @@ -67,23 +68,29 @@ jobs: displayName: 'Use NuGet' inputs: versionSpec: '6.5.x' + - task: PowerShell@2 + displayName: 'Create nuget.config with single source' + inputs: + targetType: inline + script: | + $xml = @' + + + + + + + '@ + $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config" + - task: NuGetCommand@2 # We have to use a nuget.config to provide the feed for the 'nuget install' option. displayName: 'NuGet set package source to ADO feed' inputs: command: custom - arguments: sources add -Name xboxgdk-DirectXTex -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config - - task: PowerShell@2 - displayName: 'Set nuget.config to single source' - inputs: - targetType: inline - script: | - $file = '.\NuGet.Config' - $doc = [xml](Get-Content $file) - $newelement = $doc.CreateElement("clear") - $clearadd = $doc.configuration.packageSources.PrependChild($newelement) - $doc.OuterXml | Set-Content $file - + arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config + - task: nuget-security-analysis@0 + displayName: 'Secure Supply Chain Analysis' - task: NuGetCommand@2 displayName: NuGet install PGDK inputs: diff --git a/build/DirectXTex-GitHub-SDK-prerelease.yml b/build/DirectXTex-GitHub-SDK-prerelease.yml index 13e8c56..28f69e6 100644 --- a/build/DirectXTex-GitHub-SDK-prerelease.yml +++ b/build/DirectXTex-GitHub-SDK-prerelease.yml @@ -28,6 +28,7 @@ variables: EXTRACTED_FOLDER: $(ExtractedFolder) WSDKEnableBWOI: true URL_FEED: $(ADOFeedURL) + skipNugetSecurityAnalysis: true # We explicitly call this task so we don't need it to be auto-injected pool: vmImage: windows-2022 @@ -45,23 +46,29 @@ jobs: displayName: 'Use NuGet' inputs: versionSpec: '6.5.x' + - task: PowerShell@2 + displayName: 'Create nuget.config with single source' + inputs: + targetType: inline + script: | + $xml = @' + + + + + + + '@ + $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config" + - task: NuGetCommand@2 # We have to use a nuget.config to provide the feed for the 'nuget install' option. displayName: 'NuGet set package source to ADO feed' inputs: command: custom - arguments: sources add -Name xboxgdk-DirectXTex -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config - - task: PowerShell@2 - displayName: 'Set nuget.config to single source' - inputs: - targetType: inline - script: | - $file = '.\NuGet.Config' - $doc = [xml](Get-Content $file) - $newelement = $doc.CreateElement("clear") - $clearadd = $doc.configuration.packageSources.PrependChild($newelement) - $doc.OuterXml | Set-Content $file - + arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config + - task: nuget-security-analysis@0 + displayName: 'Secure Supply Chain Analysis' - task: NuGetCommand@2 displayName: NuGet Install WSDK x64 inputs: @@ -166,22 +173,28 @@ jobs: displayName: 'Use NuGet' inputs: versionSpec: '6.5.x' + - task: PowerShell@2 + displayName: 'Create nuget.config with single source' + inputs: + targetType: inline + script: | + $xml = @' + + + + + + + '@ + $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config" + - task: NuGetCommand@2 displayName: NuGet set package source to ADO feed inputs: command: custom - arguments: sources add -Name xboxgdk-DirectXTex -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config - - task: PowerShell@2 - displayName: 'Set nuget.config to single source' - inputs: - targetType: inline - script: | - $file = '.\NuGet.Config' - $doc = [xml](Get-Content $file) - $newelement = $doc.CreateElement("clear") - $clearadd = $doc.configuration.packageSources.PrependChild($newelement) - $doc.OuterXml | Set-Content $file - + arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config + - task: nuget-security-analysis@0 + displayName: 'Secure Supply Chain Analysis' - task: NuGetCommand@2 displayName: NuGet Install WSDK x64 inputs: diff --git a/build/DirectXTex-GitHub-SDK-release.yml b/build/DirectXTex-GitHub-SDK-release.yml index 7451cdb..a5e3d1a 100644 --- a/build/DirectXTex-GitHub-SDK-release.yml +++ b/build/DirectXTex-GitHub-SDK-release.yml @@ -28,6 +28,7 @@ variables: EXTRACTED_FOLDER: $(ExtractedFolder) WSDKEnableBWOI: true URL_FEED: $(ADOFeedURL) + skipNugetSecurityAnalysis: true # We explicitly call this task so we don't need it to be auto-injected pool: vmImage: windows-2022 @@ -45,23 +46,29 @@ jobs: displayName: 'Use NuGet' inputs: versionSpec: '6.5.x' + - task: PowerShell@2 + displayName: 'Create nuget.config with single source' + inputs: + targetType: inline + script: | + $xml = @' + + + + + + + '@ + $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config" + - task: NuGetCommand@2 # We have to use a nuget.config to provide the feed for the 'nuget install' option. displayName: 'NuGet set package source to ADO feed' inputs: command: custom - arguments: sources add -Name xboxgdk-DirectXTex -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config - - task: PowerShell@2 - displayName: 'Set nuget.config to single source' - inputs: - targetType: inline - script: | - $file = '.\NuGet.Config' - $doc = [xml](Get-Content $file) - $newelement = $doc.CreateElement("clear") - $clearadd = $doc.configuration.packageSources.PrependChild($newelement) - $doc.OuterXml | Set-Content $file - + arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config + - task: nuget-security-analysis@0 + displayName: 'Secure Supply Chain Analysis' - task: NuGetCommand@2 displayName: NuGet Install WSDK x64 inputs: @@ -166,22 +173,28 @@ jobs: displayName: 'Use NuGet' inputs: versionSpec: '6.5.x' + - task: PowerShell@2 + displayName: 'Create nuget.config with single source' + inputs: + targetType: inline + script: | + $xml = @' + + + + + + + '@ + $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config" + - task: NuGetCommand@2 displayName: NuGet set package source to ADO feed inputs: command: custom - arguments: sources add -Name xboxgdk-DirectXTex -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config - - task: PowerShell@2 - displayName: 'Set nuget.config to single source' - inputs: - targetType: inline - script: | - $file = '.\NuGet.Config' - $doc = [xml](Get-Content $file) - $newelement = $doc.CreateElement("clear") - $clearadd = $doc.configuration.packageSources.PrependChild($newelement) - $doc.OuterXml | Set-Content $file - + arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config + - task: nuget-security-analysis@0 + displayName: 'Secure Supply Chain Analysis' - task: NuGetCommand@2 displayName: NuGet Install WSDK x64 inputs: