diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 75087534f4..7080fefbbf 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -17,13 +17,13 @@ parameters: jobs: -- job: CreatingVsix +- job: CreateVSIX pool: vmImage: 'windows-2019' variables: ${{if eq(parameters.releaseBuild, True) }}: - VSIXBuildArgs: '/p:"RestoreSources=https://api.nuget.org/v3/index.json;https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.Internal.ReleaseSigned/nuget/v3/index.json"' + VSIXBuildArgs: '/p:"RestoreSources=https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.Internal.ReleaseSigned/nuget/v3/index.json"' ${{if eq(parameters.releaseBuild, False) }}: VSIXBuildArgs: '' @@ -32,13 +32,6 @@ jobs: inputs: nuGetServiceConnections: Internal-ReleaseSigned - # NuGetCommand@2 - - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 - displayName: 'NuGet restore' - inputs: - command: 'custom' - arguments: 'restore dev\VSIX\packages.config -PackagesDirectory $(UserProfile)\.nuget\packages' - - task: VSBuild@1 displayName: 'Restore ProjectReunion.Extension.sln' inputs: @@ -53,7 +46,7 @@ jobs: solution: dev\VSIX\ProjectReunion.Extension.sln platform: 'Any CPU' configuration: '$(buildConfiguration)' - msBuildArgs: '/p:VSToolsPath="$(UserProfile)\.nuget\packages\microsoft.vssdk.buildtools\16.9.1050\tools" /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' + msBuildArgs: '/p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 displayName: 'Component Governance Detection' diff --git a/dev/VSIX/Directory.Build.props b/dev/VSIX/Directory.Build.props index fc78db52a0..7b8b2a4ee3 100644 --- a/dev/VSIX/Directory.Build.props +++ b/dev/VSIX/Directory.Build.props @@ -4,7 +4,6 @@ - https://api.nuget.org/v3/index.json; https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json 2.0.210211.2 diff --git a/dev/VSIX/packages.config b/dev/VSIX/packages.config deleted file mode 100644 index 9ffd0f1cb0..0000000000 --- a/dev/VSIX/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file