Skip to content

Commit

Permalink
Merge pull request #6157 from dotnet/dev/kirillo/GenerateReferenceAss…
Browse files Browse the repository at this point in the history 
…emblySource

When #6141 updated from Microsoft.DotNet.BuildTools.GenAPI to Microsoft.DotNet.GenAPI our reference assembly source generation logic stopped working.

Turns out the new NuGet package targets relies on singular spelling to insert itself after PrepareForRun:

<PrepareForRunDependsOn Condition="'$(GenerateReferenceAssemblySource)' == 'true'">

Update our spelling to singular everywhere now that we're using the new package.
  • Loading branch information
@ladipro
ladipro authored Feb 23, 2021
2 parents 257e4bb + fead1a4 commit 56626eb
Show file tree
Hide file tree
Showing 18 changed files with 549 additions and 511 deletions.
8 changes: 4 additions & 4 deletions ref/Microsoft.Build.Engine/net/Microsoft.Build.Engine.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ public void CopyTo(System.Array array, int index) { }
[System.FlagsAttribute]
public enum BuildSettings
{
DoNotResetPreviouslyBuiltTargets = 1,
None = 0,
DoNotResetPreviouslyBuiltTargets = 1,
}
public partial class BuildTask
{
Expand Down Expand Up @@ -367,13 +367,13 @@ public void SetProperty(string propertyName, string propertyValue, string condit
[System.FlagsAttribute]
public enum ProjectLoadSettings
{
IgnoreMissingImports = 1,
None = 0,
IgnoreMissingImports = 1,
}
public enum PropertyPosition
{
UseExistingOrCreateAfterLastImport = 1,
UseExistingOrCreateAfterLastPropertyGroup = 0,
UseExistingOrCreateAfterLastImport = 1,
}
public sealed partial class RemoteErrorException : System.Exception
{
Expand Down Expand Up @@ -439,8 +439,8 @@ public void CopyTo(Microsoft.Build.BuildEngine.Toolset[] array, int arrayIndex)
[System.FlagsAttribute]
public enum ToolsetDefinitionLocations
{
ConfigurationFile = 1,
None = 0,
ConfigurationFile = 1,
Registry = 2,
}
public partial class UsingTask
Expand Down
104 changes: 55 additions & 49 deletions ref/Microsoft.Build.Framework/net/Microsoft.Build.Framework.cs
View file

Large diffs are not rendered by default.

96 changes: 51 additions & 45 deletions ref/Microsoft.Build.Framework/netstandard/Microsoft.Build.Framework.cs
View file

Large diffs are not rendered by default.

240 changes: 121 additions & 119 deletions ref/Microsoft.Build.Tasks.Core/net/Microsoft.Build.Tasks.Core.cs
View file

Large diffs are not rendered by default.

236 changes: 119 additions & 117 deletions ref/Microsoft.Build.Tasks.Core/netstandard/Microsoft.Build.Tasks.Core.cs
View file

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions ref/Microsoft.Build.Utilities.Core/net/Microsoft.Build.Utilities.Core.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,17 +114,17 @@ protected virtual void VerifyThrowNoEmbeddedDoubleQuotes(string switchName, stri
public delegate bool DependencyFilter(string fullPath);
public enum DotNetFrameworkArchitecture
{
Current = 0,
Bitness32 = 1,
Bitness64 = 2,
Current = 0,
}
public enum ExecutableType
{
Managed32Bit = 3,
Managed64Bit = 4,
ManagedIL = 2,
Native32Bit = 0,
Native64Bit = 1,
ManagedIL = 2,
Managed32Bit = 3,
Managed64Bit = 4,
SameAsCurrentProcess = 5,
}
public static partial class FileTracker
Expand Down Expand Up @@ -200,10 +200,10 @@ public void UpdateFileEntryDetails() { }
}
public enum HostObjectInitializationStatus
{
NoActionReturnFailure = 3,
NoActionReturnSuccess = 2,
UseAlternateToolToExecute = 1,
UseHostObjectToExecute = 0,
UseAlternateToolToExecute = 1,
NoActionReturnSuccess = 2,
NoActionReturnFailure = 3,
}
public abstract partial class Logger : Microsoft.Build.Framework.ILogger
{
Expand All @@ -219,8 +219,8 @@ public virtual void Shutdown() { }
public enum MultipleVersionSupport
{
Allow = 0,
Error = 2,
Warning = 1,
Error = 2,
}
public partial class MuxLogger : Microsoft.Build.Framework.ILogger, Microsoft.Build.Framework.INodeLogger
{
Expand Down Expand Up @@ -302,30 +302,30 @@ public static partial class Attributes
}
public enum SDKType
{
Unspecified = 0,
External = 1,
Framework = 3,
Platform = 2,
Unspecified = 0,
Framework = 3,
}
public enum TargetDotNetFrameworkVersion
{
Latest = 9999,
Version11 = 0,
Version20 = 1,
Version30 = 2,
Version35 = 3,
Version40 = 4,
Version45 = 5,
Version451 = 6,
Version452 = 9,
Version46 = 7,
Version461 = 8,
Version452 = 9,
Version462 = 10,
VersionLatest = 10,
Version47 = 11,
Version471 = 12,
Version472 = 13,
Version48 = 14,
VersionLatest = 10,
Latest = 9999,
}
public partial class TargetPlatformSDK : System.IEquatable<Microsoft.Build.Utilities.TargetPlatformSDK>
{
Expand Down Expand Up @@ -391,7 +391,7 @@ public TaskLoggingHelper(Microsoft.Build.Framework.ITask taskInstance) { }
public string HelpKeywordPrefix { get { throw null; } set { } }
protected string TaskName { get { throw null; } }
public System.Resources.ResourceManager TaskResources { get { throw null; } set { } }
public string ExtractMessageCode(string message, out string messageWithoutCodePrefix) { messageWithoutCodePrefix = default(string); throw null; }
public string ExtractMessageCode(string message, out string messageWithoutCodePrefix) { throw null; }
public virtual string FormatResourceString(string resourceName, params object[] args) { throw null; }
public virtual string FormatString(string unformatted, params object[] args) { throw null; }
public virtual string GetResourceMessage(string resourceName) { throw null; }
Expand Down Expand Up @@ -449,8 +449,8 @@ public static void ClearSDKStaticCache() { }
public static string GetDotNetFrameworkSdkRootRegistryKey(Microsoft.Build.Utilities.TargetDotNetFrameworkVersion version) { throw null; }
public static string GetDotNetFrameworkSdkRootRegistryKey(Microsoft.Build.Utilities.TargetDotNetFrameworkVersion version, Microsoft.Build.Utilities.VisualStudioVersion visualStudioVersion) { throw null; }
public static string GetDotNetFrameworkVersionFolderPrefix(Microsoft.Build.Utilities.TargetDotNetFrameworkVersion version) { throw null; }
public static System.Collections.Generic.IEnumerable<string> GetFoldersInVSInstalls(System.Version minVersion=null, System.Version maxVersion=null, string subFolder=null) { throw null; }
public static string GetFoldersInVSInstallsAsString(string minVersionString=null, string maxVersionString=null, string subFolder=null) { throw null; }
public static System.Collections.Generic.IEnumerable<string> GetFoldersInVSInstalls(System.Version minVersion = null, System.Version maxVersion = null, string subFolder = null) { throw null; }
public static string GetFoldersInVSInstallsAsString(string minVersionString = null, string maxVersionString = null, string subFolder = null) { throw null; }
public static string GetLatestSDKTargetPlatformVersion(string sdkIdentifier, string sdkVersion) { throw null; }
public static string GetLatestSDKTargetPlatformVersion(string sdkIdentifier, string sdkVersion, string[] sdkRoots) { throw null; }
public static string GetPathToBuildTools(string toolsVersion) { throw null; }
Expand Down Expand Up @@ -512,7 +512,7 @@ public static void ClearSDKStaticCache() { }
public static System.Collections.Generic.IEnumerable<string> GetPlatformsForSDK(string sdkIdentifier, System.Version sdkVersion) { throw null; }
public static System.Collections.Generic.IEnumerable<string> GetPlatformsForSDK(string sdkIdentifier, System.Version sdkVersion, string[] diskRoots, string registryRoot) { throw null; }
public static string GetProgramFilesReferenceAssemblyRoot() { throw null; }
public static string GetSDKContentFolderPath(string sdkIdentifier, string sdkVersion, string targetPlatformIdentifier, string targetPlatformMinVersion, string targetPlatformVersion, string folderName, string diskRoot=null) { throw null; }
public static string GetSDKContentFolderPath(string sdkIdentifier, string sdkVersion, string targetPlatformIdentifier, string targetPlatformMinVersion, string targetPlatformVersion, string folderName, string diskRoot = null) { throw null; }
public static System.Collections.Generic.IList<string> GetSDKDesignTimeFolders(string sdkRoot) { throw null; }
public static System.Collections.Generic.IList<string> GetSDKDesignTimeFolders(string sdkRoot, string targetConfiguration, string targetArchitecture) { throw null; }
public static System.Collections.Generic.IList<string> GetSDKRedistFolders(string sdkRoot) { throw null; }
Expand Down Expand Up @@ -585,8 +585,8 @@ public static partial class TrackedDependencies
public enum UpToDateCheckType
{
InputNewerThanOutput = 0,
InputNewerThanTracking = 2,
InputOrOutputNewerThanTracking = 1,
InputNewerThanTracking = 2,
}
public enum VisualStudioVersion
{
Expand Down
28 changes: 14 additions & 14 deletions ref/Microsoft.Build.Utilities.Core/netstandard/Microsoft.Build.Utilities.Core.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ protected virtual void VerifyThrowNoEmbeddedDoubleQuotes(string switchName, stri
}
public enum DotNetFrameworkArchitecture
{
Current = 0,
Bitness32 = 1,
Bitness64 = 2,
Current = 0,
}
public enum HostObjectInitializationStatus
{
NoActionReturnFailure = 3,
NoActionReturnSuccess = 2,
UseAlternateToolToExecute = 1,
UseHostObjectToExecute = 0,
UseAlternateToolToExecute = 1,
NoActionReturnSuccess = 2,
NoActionReturnFailure = 3,
}
public abstract partial class Logger : Microsoft.Build.Framework.ILogger
{
Expand All @@ -64,8 +64,8 @@ public virtual void Shutdown() { }
public enum MultipleVersionSupport
{
Allow = 0,
Error = 2,
Warning = 1,
Error = 2,
}
public partial class MuxLogger : Microsoft.Build.Framework.ILogger, Microsoft.Build.Framework.INodeLogger
{
Expand Down Expand Up @@ -147,30 +147,30 @@ public static partial class Attributes
}
public enum SDKType
{
Unspecified = 0,
External = 1,
Framework = 3,
Platform = 2,
Unspecified = 0,
Framework = 3,
}
public enum TargetDotNetFrameworkVersion
{
Latest = 9999,
Version11 = 0,
Version20 = 1,
Version30 = 2,
Version35 = 3,
Version40 = 4,
Version45 = 5,
Version451 = 6,
Version452 = 9,
Version46 = 7,
Version461 = 8,
Version452 = 9,
Version462 = 10,
VersionLatest = 10,
Version47 = 11,
Version471 = 12,
Version472 = 13,
Version48 = 14,
VersionLatest = 10,
Latest = 9999,
}
public partial class TargetPlatformSDK : System.IEquatable<Microsoft.Build.Utilities.TargetPlatformSDK>
{
Expand Down Expand Up @@ -234,7 +234,7 @@ public TaskLoggingHelper(Microsoft.Build.Framework.ITask taskInstance) { }
public string HelpKeywordPrefix { get { throw null; } set { } }
protected string TaskName { get { throw null; } }
public System.Resources.ResourceManager TaskResources { get { throw null; } set { } }
public string ExtractMessageCode(string message, out string messageWithoutCodePrefix) { messageWithoutCodePrefix = default(string); throw null; }
public string ExtractMessageCode(string message, out string messageWithoutCodePrefix) { throw null; }
public virtual string FormatResourceString(string resourceName, params object[] args) { throw null; }
public virtual string FormatString(string unformatted, params object[] args) { throw null; }
public virtual string GetResourceMessage(string resourceName) { throw null; }
Expand Down Expand Up @@ -289,8 +289,8 @@ public static void ClearSDKStaticCache() { }
public static string GetDotNetFrameworkSdkRootRegistryKey(Microsoft.Build.Utilities.TargetDotNetFrameworkVersion version) { throw null; }
public static string GetDotNetFrameworkSdkRootRegistryKey(Microsoft.Build.Utilities.TargetDotNetFrameworkVersion version, Microsoft.Build.Utilities.VisualStudioVersion visualStudioVersion) { throw null; }
public static string GetDotNetFrameworkVersionFolderPrefix(Microsoft.Build.Utilities.TargetDotNetFrameworkVersion version) { throw null; }
public static System.Collections.Generic.IEnumerable<string> GetFoldersInVSInstalls(System.Version minVersion=null, System.Version maxVersion=null, string subFolder=null) { throw null; }
public static string GetFoldersInVSInstallsAsString(string minVersionString=null, string maxVersionString=null, string subFolder=null) { throw null; }
public static System.Collections.Generic.IEnumerable<string> GetFoldersInVSInstalls(System.Version minVersion = null, System.Version maxVersion = null, string subFolder = null) { throw null; }
public static string GetFoldersInVSInstallsAsString(string minVersionString = null, string maxVersionString = null, string subFolder = null) { throw null; }
public static string GetLatestSDKTargetPlatformVersion(string sdkIdentifier, string sdkVersion) { throw null; }
public static string GetLatestSDKTargetPlatformVersion(string sdkIdentifier, string sdkVersion, string[] sdkRoots) { throw null; }
public static string GetPathToBuildTools(string toolsVersion) { throw null; }
Expand Down Expand Up @@ -352,7 +352,7 @@ public static void ClearSDKStaticCache() { }
public static System.Collections.Generic.IEnumerable<string> GetPlatformsForSDK(string sdkIdentifier, System.Version sdkVersion) { throw null; }
public static System.Collections.Generic.IEnumerable<string> GetPlatformsForSDK(string sdkIdentifier, System.Version sdkVersion, string[] diskRoots, string registryRoot) { throw null; }
public static string GetProgramFilesReferenceAssemblyRoot() { throw null; }
public static string GetSDKContentFolderPath(string sdkIdentifier, string sdkVersion, string targetPlatformIdentifier, string targetPlatformMinVersion, string targetPlatformVersion, string folderName, string diskRoot=null) { throw null; }
public static string GetSDKContentFolderPath(string sdkIdentifier, string sdkVersion, string targetPlatformIdentifier, string targetPlatformMinVersion, string targetPlatformVersion, string folderName, string diskRoot = null) { throw null; }
public static System.Collections.Generic.IList<string> GetSDKDesignTimeFolders(string sdkRoot) { throw null; }
public static System.Collections.Generic.IList<string> GetSDKDesignTimeFolders(string sdkRoot, string targetConfiguration, string targetArchitecture) { throw null; }
public static System.Collections.Generic.IList<string> GetSDKRedistFolders(string sdkRoot) { throw null; }
Expand Down
Loading

0 comments on commit 56626eb

Please sign in to comment.