Skip to content

Commit 591fe21

Browse files
DonnaChen888DonnaChen888
committed
Merge branch 'release/10.0.2xx' of https://github.com/dotnet/templating into merge/release/10.0.1xx-to-release/10.0.2xx
2 parents a6c6797 + 4e82975 commit 591fe21

File tree

19 files changed

+80
-58
lines changed

19 files changed

+80
-58
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,3 +258,4 @@ Microsoft.TemplateEngine.VC.db
258258

259259
#Rider
260260
.idea/
261+
.nuget/

‎Directory.Build.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
<NetMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetCurrent)</NetMinimum>
4343

4444
<PublishWindowsPdb>false</PublishWindowsPdb>
45+
46+
<NoWarn Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NoWarn);IDE0370</NoWarn>
4547
</PropertyGroup>
4648

4749
<ItemGroup Condition="'$(EnableAnalyzers)' == 'true'">

‎NuGet.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-dotnet -->
7-
<add key="darc-pub-dotnet-dotnet-ebe6ebb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-ebe6ebbc/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-dotnet -->
98
<!-- Begin: Package sources from dotnet-runtime -->
109
<!-- End: Package sources from dotnet-runtime -->
@@ -23,6 +22,8 @@
2322
<disabledPackageSources>
2423
<clear />
2524
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
25+
<!-- Begin: Package sources from dotnet-dotnet -->
26+
<!-- End: Package sources from dotnet-dotnet -->
2627
<!-- Begin: Package sources from dotnet-runtime -->
2728
<!-- End: Package sources from dotnet-runtime -->
2829
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet-dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26175.123</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<SystemCommandLinePackageVersion>2.0.6</SystemCommandLinePackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26176.114</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<SystemCommandLinePackageVersion>2.0.4</SystemCommandLinePackageVersion>
1111
<!-- dotnet-runtime dependencies -->
1212
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.1</MicrosoftBclAsyncInterfacesPackageVersion>
1313
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>10.0.1</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="ebe6ebbcfec145053fd5e04812abe8d2a4e53bda" BarId="307867" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="fe2ab887a1f927eecfd09ddfc4fb8e2ddf1607ee" BarId="307981" />
44
<ProductDependencies>
5-
<Dependency Name="System.CommandLine" Version="2.0.6">
6-
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>ebe6ebbcfec145053fd5e04812abe8d2a4e53bda</Sha>
5+
<Dependency Name="System.CommandLine" Version="2.0.4">
6+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
7+
<Sha>80d3e14f5e08b4888f464e3cd0d0b2445b63ec46</Sha>
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26175.123">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26176.114">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>ebe6ebbcfec145053fd5e04812abe8d2a4e53bda</Sha>
13+
<Sha>fe2ab887a1f927eecfd09ddfc4fb8e2ddf1607ee</Sha>
1414
</Dependency>
1515
<!-- Dependencies required for source build. We'll still update manually -->
1616
<Dependency Name="System.Formats.Asn1" Version="10.0.1">

‎eng/Versions.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project>
2-
3-
<Import Project="Version.Details.props" />
4-
2+
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
53
<PropertyGroup>
6-
<VersionPrefix>10.0.106</VersionPrefix>
4+
<VersionPrefix>10.0.202</VersionPrefix>
5+
<!-- When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages -->
6+
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
7+
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
8+
<!-- Calculate prerelease label -->
79
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
10+
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and $(VersionPrefix.EndsWith('00'))">rtm</PreReleaseVersionLabel>
11+
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel>
812
<PreReleaseVersionIteration></PreReleaseVersionIteration>
9-
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
10-
<DotNetFinalVersionKind></DotNetFinalVersionKind>
11-
12-
<!-- Opt-in/out repo features -->
1313
<UsingToolXliff>true</UsingToolXliff>
14+
<FlagNetStandard1XDependencies>true</FlagNetStandard1XDependencies>
1415
</PropertyGroup>
15-
1616
</Project>

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.105",
3+
"version": "10.0.201",
44
"allowPrerelease": true,
55
"rollForward": "latestFeature",
66
"paths": [
@@ -10,9 +10,9 @@
1010
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
1111
},
1212
"tools": {
13-
"dotnet": "10.0.105"
13+
"dotnet": "10.0.201"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26175.123"
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26176.114"
1717
}
1818
}

‎src/Microsoft.TemplateEngine.Abstractions/Installer/InstallRequest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public InstallRequest(string identifier, string? version = null, string? install
2424
/// <summary>
2525
/// Name to be used when display the request.
2626
/// </summary>
27-
public string DisplayName => string.IsNullOrWhiteSpace(Version) ? PackageIdentifier : $"{PackageIdentifier}::{Version}";
27+
public string DisplayName => string.IsNullOrWhiteSpace(Version) ? PackageIdentifier : $"{PackageIdentifier}@{Version}";
2828

2929
/// <summary>
3030
/// Installer to be used to install the request.

‎src/Microsoft.TemplateEngine.Edge/Installers/NuGet/Exceptions/DownloadException.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ namespace Microsoft.TemplateEngine.Edge.Installers.NuGet
55
{
66
internal class DownloadException : Exception
77
{
8-
public DownloadException(string packageIdentifier, string packageVersion, string filePath) : base($"Failed to download {packageIdentifier}::{packageVersion} from {filePath}")
8+
public DownloadException(string packageIdentifier, string packageVersion, string filePath) : base($"Failed to download {packageIdentifier}@{packageVersion} from {filePath}")
99
{
1010
PackageIdentifier = packageIdentifier;
1111
PackageVersion = packageVersion;
1212
PackageLocation = filePath;
1313
}
1414

15-
public DownloadException(string packageIdentifier, string packageVersion, IEnumerable<string> attemptedSources) : base($"Failed to download {packageIdentifier}::{packageVersion} from NuGet feeds {string.Join(";", attemptedSources)}")
15+
public DownloadException(string packageIdentifier, string packageVersion, IEnumerable<string> attemptedSources) : base($"Failed to download {packageIdentifier}@{packageVersion} from NuGet feeds {string.Join(";", attemptedSources)}")
1616
{
1717
PackageIdentifier = packageIdentifier;
1818
PackageVersion = packageVersion;
1919
SourcesList = attemptedSources;
2020
}
2121

22-
public DownloadException(string packageIdentifier, string packageVersion, IEnumerable<string> attemptedSources, Exception inner) : base($"Failed to download {packageIdentifier}::{packageVersion} from NuGet feeds {string.Join(";", attemptedSources)}", inner)
22+
public DownloadException(string packageIdentifier, string packageVersion, IEnumerable<string> attemptedSources, Exception inner) : base($"Failed to download {packageIdentifier}@{packageVersion} from NuGet feeds {string.Join(";", attemptedSources)}", inner)
2323
{
2424
PackageIdentifier = packageIdentifier;
2525
PackageVersion = packageVersion;

‎src/Microsoft.TemplateEngine.Edge/Installers/NuGet/Exceptions/PackageNotFoundException.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ internal class PackageNotFoundException : Exception
1313
SourcesList = attemptedSources;
1414
}
1515

16-
public PackageNotFoundException(string packageIdentifier, NuGetVersion packageVersion, IEnumerable<string> attemptedSources) : base($"{packageIdentifier}::{packageVersion} was not found in NuGet feeds {string.Join(";", attemptedSources)}")
16+
public PackageNotFoundException(string packageIdentifier, NuGetVersion packageVersion, IEnumerable<string> attemptedSources) : base($"{packageIdentifier}@{packageVersion} was not found in NuGet feeds {string.Join(";", attemptedSources)}")
1717
{
1818
PackageIdentifier = packageIdentifier;
1919
PackageVersion = packageVersion;

0 commit comments

Comments
 (0)