Skip to content

Commit e5e25da

Browse files
authored
Merge pull request #9649 from drewnoakes/fix-build
Fix CI builds
2 parents 66d8ebf + f0098af commit e5e25da

File tree

7 files changed

+51
-25
lines changed

7 files changed

+51
-25
lines changed

eng/pipelines/templates/build-official-release.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,18 @@ jobs:
130130
displayName: === Build Repository ===
131131
condition: false
132132

133+
- task: NuGetAuthenticate@1
134+
displayName: Authenticate NuGet feeds
135+
inputs:
136+
forceReinstallCredentialProvider: true
137+
138+
# Ensure the required .NET SDK version is installed.
139+
- task: UseDotNet@2
140+
displayName: Use .NET SDK from global.json
141+
inputs:
142+
packageType: 'sdk'
143+
useGlobalJson: true
144+
133145
# Runs the full build of the projects in the repository. See Build.proj for details.
134146
- script: $(Build.SourcesDirectory)/build.cmd /v:normal /p:Configuration=$(BuildConfiguration) /p:CIBuild=true
135147
displayName: Build All Projects

eng/pipelines/templates/build-pull-request.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,18 @@ jobs:
2424
- powershell: npm --version
2525
displayName: Check npm version
2626

27+
- task: NuGetAuthenticate@1
28+
displayName: Authenticate NuGet feeds
29+
inputs:
30+
forceReinstallCredentialProvider: true
31+
32+
# Ensure the required .NET SDK version is installed.
33+
- task: UseDotNet@2
34+
displayName: Use .NET SDK from global.json
35+
inputs:
36+
packageType: 'sdk'
37+
useGlobalJson: true
38+
2739
# Ensure the .NET runtime needed by our unit tests is installed.
2840
- task: UseDotNet@2
2941
displayName: Install .NET Runtime

global.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"sdk": {
3+
"version": "9.0.104"
4+
}
5+
}

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Debug/VBDefineConstantsEncoding.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace Microsoft.VisualStudio.ProjectSystem.Debug;
66

7-
87
[Export(typeof(INameValuePairListEncoding))]
98
[ExportMetadata("Encoding", "VBDefineConstantsEncoding")]
109
internal sealed class VBDefineConstantsEncoding : INameValuePairListEncoding

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/PropertyPages/Editors/PropertyEditorBase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
namespace Microsoft.VisualStudio.ProjectSystem.VS.Implementation.PropertyPages.Designer;
99

10-
1110
/// <summary>
1211
/// Base class for property editors that ship with the Project Properties UI.
1312
/// </summary>

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/PublicAPI.Shipped.txt

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,4 +429,25 @@ Microsoft.VisualStudio.ProjectSystem.VS.HotReload.IProjectHotReloadNotificationS
429429
Microsoft.VisualStudio.ProjectSystem.VS.HotReload.IProjectHotReloadNotificationService.SetHotReloadStateAsync(bool isInHotReload) -> System.Threading.Tasks.Task!
430430
Microsoft.VisualStudio.ProjectSystem.VS.Tree.Dependencies.AttachedCollections.IObjectBrowserItem
431431
Microsoft.VisualStudio.ProjectSystem.VS.Tree.Dependencies.AttachedCollections.IObjectBrowserItem.AssemblyPath.get -> string?
432-
static Microsoft.VisualStudio.ProjectSystem.VS.Tree.Dependencies.AttachedCollections.RelatableItemBase.CreateContextMenuController(System.Guid menuGuid, int menuId) -> Microsoft.Internal.VisualStudio.PlatformUI.IContextMenuController!
432+
static Microsoft.VisualStudio.ProjectSystem.VS.Tree.Dependencies.AttachedCollections.RelatableItemBase.CreateContextMenuController(System.Guid menuGuid, int menuId) -> Microsoft.Internal.VisualStudio.PlatformUI.IContextMenuController!
433+
Microsoft.VisualStudio.ProjectSystem.VS.Query.ContextAndRuleProviderState
434+
Microsoft.VisualStudio.ProjectSystem.VS.Query.ContextAndRuleProviderState.ContextAndRuleProviderState(Microsoft.VisualStudio.ProjectSystem.VS.Query.IProjectState! projectState, Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext! propertiesContext, Microsoft.Build.Framework.XamlTypes.Rule! rule) -> void
435+
Microsoft.VisualStudio.ProjectSystem.VS.Query.ContextAndRuleProviderState.ProjectState.get -> Microsoft.VisualStudio.ProjectSystem.VS.Query.IProjectState!
436+
Microsoft.VisualStudio.ProjectSystem.VS.Query.ContextAndRuleProviderState.PropertiesContext.get -> Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext!
437+
Microsoft.VisualStudio.ProjectSystem.VS.Query.ContextAndRuleProviderState.Rule.get -> Microsoft.Build.Framework.XamlTypes.Rule!
438+
Microsoft.VisualStudio.ProjectSystem.VS.Query.IProjectState
439+
Microsoft.VisualStudio.ProjectSystem.VS.Query.IProjectState.BindToRuleAsync(Microsoft.VisualStudio.ProjectSystem.ProjectConfiguration! projectConfiguration, string! schemaName, Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext! propertiesContext) -> System.Threading.Tasks.Task<Microsoft.VisualStudio.ProjectSystem.Properties.IRule?>!
440+
Microsoft.VisualStudio.ProjectSystem.VS.Query.IProjectState.GetDataVersionAsync(Microsoft.VisualStudio.ProjectSystem.ProjectConfiguration! configuration) -> System.Threading.Tasks.Task<(string! versionKey, long versionNumber)?>!
441+
Microsoft.VisualStudio.ProjectSystem.VS.Query.IProjectState.GetKnownConfigurationsAsync() -> System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableSet<Microsoft.VisualStudio.ProjectSystem.ProjectConfiguration!>?>!
442+
Microsoft.VisualStudio.ProjectSystem.VS.Query.IProjectState.GetMetadataVersionAsync() -> System.Threading.Tasks.Task<(string! versionKey, long versionNumber)?>!
443+
Microsoft.VisualStudio.ProjectSystem.VS.Query.IProjectState.GetSuggestedConfigurationAsync() -> System.Threading.Tasks.Task<Microsoft.VisualStudio.ProjectSystem.ProjectConfiguration?>!
444+
Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext
445+
Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.Equals(Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext? other) -> bool
446+
Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.File.get -> string!
447+
Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.IsProjectFile.get -> bool
448+
Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.ItemName.get -> string?
449+
Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.ItemType.get -> string?
450+
Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.QueryProjectPropertiesContext(bool isProjectFile, string! file, string? itemType, string? itemName) -> void
451+
override Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.Equals(object! obj) -> bool
452+
override Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.GetHashCode() -> int
453+
static readonly Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.ProjectFile -> Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext!
Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +0,0 @@
1-
Microsoft.VisualStudio.ProjectSystem.VS.Query.ContextAndRuleProviderState
2-
Microsoft.VisualStudio.ProjectSystem.VS.Query.ContextAndRuleProviderState.ContextAndRuleProviderState(Microsoft.VisualStudio.ProjectSystem.VS.Query.IProjectState! projectState, Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext! propertiesContext, Microsoft.Build.Framework.XamlTypes.Rule! rule) -> void
3-
Microsoft.VisualStudio.ProjectSystem.VS.Query.ContextAndRuleProviderState.ProjectState.get -> Microsoft.VisualStudio.ProjectSystem.VS.Query.IProjectState!
4-
Microsoft.VisualStudio.ProjectSystem.VS.Query.ContextAndRuleProviderState.PropertiesContext.get -> Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext!
5-
Microsoft.VisualStudio.ProjectSystem.VS.Query.ContextAndRuleProviderState.Rule.get -> Microsoft.Build.Framework.XamlTypes.Rule!
6-
Microsoft.VisualStudio.ProjectSystem.VS.Query.IProjectState
7-
Microsoft.VisualStudio.ProjectSystem.VS.Query.IProjectState.BindToRuleAsync(Microsoft.VisualStudio.ProjectSystem.ProjectConfiguration! projectConfiguration, string! schemaName, Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext! propertiesContext) -> System.Threading.Tasks.Task<Microsoft.VisualStudio.ProjectSystem.Properties.IRule?>!
8-
Microsoft.VisualStudio.ProjectSystem.VS.Query.IProjectState.GetDataVersionAsync(Microsoft.VisualStudio.ProjectSystem.ProjectConfiguration! configuration) -> System.Threading.Tasks.Task<(string! versionKey, long versionNumber)?>!
9-
Microsoft.VisualStudio.ProjectSystem.VS.Query.IProjectState.GetKnownConfigurationsAsync() -> System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableSet<Microsoft.VisualStudio.ProjectSystem.ProjectConfiguration!>?>!
10-
Microsoft.VisualStudio.ProjectSystem.VS.Query.IProjectState.GetMetadataVersionAsync() -> System.Threading.Tasks.Task<(string! versionKey, long versionNumber)?>!
11-
Microsoft.VisualStudio.ProjectSystem.VS.Query.IProjectState.GetSuggestedConfigurationAsync() -> System.Threading.Tasks.Task<Microsoft.VisualStudio.ProjectSystem.ProjectConfiguration?>!
12-
Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext
13-
Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.Equals(Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext? other) -> bool
14-
Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.File.get -> string!
15-
Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.IsProjectFile.get -> bool
16-
Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.ItemName.get -> string?
17-
Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.ItemType.get -> string?
18-
Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.QueryProjectPropertiesContext(bool isProjectFile, string! file, string? itemType, string? itemName) -> void
19-
override Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.Equals(object! obj) -> bool
20-
override Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.GetHashCode() -> int
21-
static Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.TryCreateFromEntityId(Microsoft.VisualStudio.ProjectSystem.Query.EntityIdentity! id, out Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext? propertiesContext) -> bool
22-
static readonly Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.ProjectFile -> Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext!

0 commit comments

Comments
 (0)