Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/source-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@
"commitSha": "26c6c313a35f020dc9fa8c7270a012bcd75fc81b"
},
{
"barId": 285272,
"barId": 286484,
"path": "templating",
"remoteUri": "https://github.com/dotnet/templating",
"commitSha": "4c36907d7149f0b3b59c7178acea6330540df851"
"commitSha": "89fd90b5b2016cff0ee924dca2c8bf71b4935a39"
},
{
"barId": 285355,
Expand Down
7 changes: 7 additions & 0 deletions src/templating/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,14 @@ dotnet_code_quality.ca1822.api_surface = private, internal
dotnet_code_quality.ca2208.api_surface = public
dotnet_diagnostic.CS1591.severity = suggestion
dotnet_analyzer_diagnostic.category-Style.severity = warning
#Name can be simplified
dotnet_diagnostic.IDE0002.severity = suggestion
#Use explicit type instead of var
dotnet_diagnostic.IDE0008.severity = suggestion
#Add missing cases to switch statement
dotnet_diagnostic.IDE0010.severity = suggestion
#Simplify LINQ expression
dotnet_diagnostic.IDE0120.severity = suggestion
#Use expression body for constructors
dotnet_diagnostic.IDE0021.severity = suggestion
#Use expression body for methods
Expand Down Expand Up @@ -235,6 +239,9 @@ file_header_template = Licensed to the .NET Foundation under one or more agreeme
# Ensure minimum API surface is respected
dotnet_diagnostic.BCL0001.severity = warning

# Don't require explicit access modifiers for interface members (conflicts with IDE0040)
dotnet_diagnostic.SA1400.severity = none

# AppContext default value expected to be true
dotnet_diagnostic.BCL0010.severity = warning

Expand Down
4 changes: 2 additions & 2 deletions src/templating/eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25479.109</MicrosoftDotNetArcadeSdkPackageVersion>
<SystemCommandLinePackageVersion>2.0.0-rtm.25479.109</SystemCommandLinePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetArcadeSdkPackageVersion>
<SystemCommandLinePackageVersion>2.0.0-rtm.25509.106</SystemCommandLinePackageVersion>
<!-- _git/dotnet-runtime dependencies -->
<MicrosoftBclAsyncInterfacesPackageVersion>9.0.3</MicrosoftBclAsyncInterfacesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>9.0.3</MicrosoftExtensionsLoggingPackageVersion>
Expand Down
10 changes: 5 additions & 5 deletions src/templating/eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="8aba88f6f12f3ce1dd5740575cff9442f1f9122c" BarId="285155" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="f448387a0e80f2fdeaec2d2f99ace7284fe37aac" BarId="286402" />
<ProductDependencies>
<Dependency Name="System.CommandLine" Version="2.0.0-rtm.25479.109">
<Dependency Name="System.CommandLine" Version="2.0.0-rtm.25509.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8aba88f6f12f3ce1dd5740575cff9442f1f9122c</Sha>
<Sha>f448387a0e80f2fdeaec2d2f99ace7284fe37aac</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25479.109">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25509.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8aba88f6f12f3ce1dd5740575cff9442f1f9122c</Sha>
<Sha>f448387a0e80f2fdeaec2d2f99ace7284fe37aac</Sha>
</Dependency>
<!-- Dependencies required for source build. We'll still update manually -->
<Dependency Name="System.Formats.Asn1" Version="9.0.3">
Expand Down
4 changes: 4 additions & 0 deletions src/templating/eng/common/core-templates/job/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ parameters:
# container and pool.
platform: {}

# Optional list of directories to ignore for component governance scans.
componentGovernanceIgnoreDirectories: []

is1ESPipeline: ''

# If set to true and running on a non-public project,
Expand Down Expand Up @@ -94,3 +97,4 @@ jobs:
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
platform: ${{ parameters.platform }}
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ parameters:
# one job runs on 'defaultManagedPlatform'.
platforms: []

# Optional list of directories to ignore for component governance scans.
componentGovernanceIgnoreDirectories: []

is1ESPipeline: ''

# If set to true and running on a non-public project,
Expand All @@ -31,6 +34,7 @@ jobs:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
jobNamePrefix: ${{ parameters.jobNamePrefix }}
platform: ${{ platform }}
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
enableInternalSources: ${{ parameters.enableInternalSources }}

- ${{ if eq(length(parameters.platforms), 0) }}:
Expand All @@ -39,4 +43,5 @@ jobs:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
jobNamePrefix: ${{ parameters.jobNamePrefix }}
platform: ${{ parameters.defaultManagedPlatform }}
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
enableInternalSources: ${{ parameters.enableInternalSources }}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ parameters:
# for details. The entire object is described in the 'job' template for simplicity, even though
# the usage of the properties on this object is split between the 'job' and 'steps' templates.
platform: {}

# Optional list of directories to ignore for component governance scans.
componentGovernanceIgnoreDirectories: []

is1ESPipeline: false

steps:
Expand Down
2 changes: 1 addition & 1 deletion src/templating/global.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"dotnet": "10.0.100-rc.1.25451.107"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25479.109"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25509.106"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ public interface IBindSymbolSource : IPrioritizedComponent
/// <summary>
/// The user friendly name of the component.
/// </summary>
public string DisplayName { get; }
string DisplayName { get; }

/// <summary>
/// Prefix that is used in binding to reference the component.
/// </summary>
public string? SourcePrefix { get; }
string? SourcePrefix { get; }

/// <summary>
/// If set to true, the component required exact prefix match to be used.
/// </summary>
public bool RequiresPrefixMatch { get; }
bool RequiresPrefixMatch { get; }

/// <summary>
/// Gets the value corresponding to <paramref name="bindName"/>.
Expand All @@ -31,6 +31,6 @@ public interface IBindSymbolSource : IPrioritizedComponent
/// <param name="bindName">the value to retrieve (without prefix).</param>
/// <param name="cancellationToken">cancellation token.</param>
/// <returns></returns>
public Task<string?> GetBoundValueAsync(IEngineEnvironmentSettings settings, string bindName, CancellationToken cancellationToken);
Task<string?> GetBoundValueAsync(IEngineEnvironmentSettings settings, string bindName, CancellationToken cancellationToken);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ public interface ISdkInfoProvider : IIdentifiedComponent
/// </summary>
/// <param name="cancellationToken"></param>
/// <returns>SDK version.</returns>
public Task<string> GetCurrentVersionAsync(CancellationToken cancellationToken);
Task<string> GetCurrentVersionAsync(CancellationToken cancellationToken);

/// <summary>
/// All installed SDK installations semver version strings.
/// </summary>
/// <param name="cancellationToken"></param>
/// <returns>SDK version strings.</returns>
public Task<IEnumerable<string>> GetInstalledVersionsAsync(CancellationToken cancellationToken);
Task<IEnumerable<string>> GetInstalledVersionsAsync(CancellationToken cancellationToken);

/// <summary>
/// Provides localized suggestion on action to be taken so that constraints requiring specified workloads can be met.
Expand All @@ -31,6 +31,6 @@ public interface ISdkInfoProvider : IIdentifiedComponent
/// <param name="supportedVersions">SDK versions required by a constraint (in an 'OR' relationship).</param>
/// <param name="viableInstalledVersions">SDK versions installed, that can meet the constraint - instructions should be provided to switch to any of those.</param>
/// <returns>Localized string with remedy suggestion specific to current host.</returns>
public string ProvideConstraintRemedySuggestion(IReadOnlyList<string> supportedVersions, IReadOnlyList<string> viableInstalledVersions);
string ProvideConstraintRemedySuggestion(IReadOnlyList<string> supportedVersions, IReadOnlyList<string> viableInstalledVersions);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public interface IWorkloadsInfoProvider : IIdentifiedComponent
/// </summary>
/// <param name="token"></param>
/// <returns>Set of installed workloads.</returns>
public Task<IEnumerable<WorkloadInfo>> GetInstalledWorkloadsAsync(CancellationToken token);
Task<IEnumerable<WorkloadInfo>> GetInstalledWorkloadsAsync(CancellationToken token);

/// <summary>
/// Provides localized suggestion on action to be taken so that constraints requiring specified workloads can be met.
Expand All @@ -23,6 +23,6 @@ public interface IWorkloadsInfoProvider : IIdentifiedComponent
/// </summary>
/// <param name="supportedWorkloads">Workloads required by a constraint (in an 'OR' relationship).</param>
/// <returns>Localized string with remedy suggestion specific to current host.</returns>
public string ProvideConstraintRemedySuggestion(IReadOnlyList<string> supportedWorkloads);
string ProvideConstraintRemedySuggestion(IReadOnlyList<string> supportedWorkloads);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public interface IValidationEntry
/// <summary>
/// Error severity.
/// </summary>
public enum SeverityLevel
enum SeverityLevel
{
None,
Info,
Expand Down Expand Up @@ -42,7 +42,7 @@ public enum SeverityLevel
/// <summary>
/// Details of the error location.
/// </summary>
public readonly struct ErrorLocation
readonly struct ErrorLocation
{
/// <summary>
/// Gets the filename where the error occurred.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,40 +11,40 @@ public interface ITemplatePackageInfo
/// <summary>
/// Gets template package name.
/// </summary>
public string Name { get; }
string Name { get; }

/// <summary>
/// Gets template package version.
/// </summary>
public string? Version { get; }
string? Version { get; }

/// <summary>
/// Gets total number of downloads for the package.
/// Optional, might be 0 in case search provider cannot provide number of downloads.
/// </summary>
public long TotalDownloads { get; }
long TotalDownloads { get; }

/// <summary>
/// Gets the list of template package owners.
/// </summary>
public IReadOnlyList<string> Owners { get; }
IReadOnlyList<string> Owners { get; }

/// <summary>
/// Gets the indication if the package is verified.
/// </summary>
/// <remarks>
/// For NuGet.org 'verified' means that package ID is under reserved namespaces, see <see href="https://docs.microsoft.com/en-us/nuget/nuget-org/id-prefix-reservation"/>.
/// </remarks>
public bool Reserved { get; }
bool Reserved { get; }

/// <summary>
/// Gets the NuGet package description.
/// </summary>
public string? Description { get; }
string? Description { get; }

/// <summary>
/// Gets the URL to the package icon.
/// </summary>
public string? IconUrl { get; }
string? IconUrl { get; }
}
}