Skip to content

Commit f0f2dff

Browse files
author
Mirroring
committed
Merge commit 'c6fce02a650d2e2c9644dae58d037818aa7662f0'
2 parents c5b93c8 + c6fce02 commit f0f2dff

File tree

6 files changed

+35
-37
lines changed

6 files changed

+35
-37
lines changed

‎NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<add key="darc-int-dotnet-runtime-2aade6b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-1/nuget/v3/index.json" />
4141
<!-- End: Package sources from dotnet-runtime -->
4242
<!-- Begin: Package sources from dotnet-templating -->
43-
<add key="darc-pub-dotnet-templating-b5712b9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b5712b99/nuget/v3/index.json" />
43+
<add key="darc-pub-dotnet-templating-0900b58" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-0900b585/nuget/v3/index.json" />
4444
<!-- End: Package sources from dotnet-templating -->
4545
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4646
<add key="darc-int-dotnet-windowsdesktop-d3e7d29" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d3e7d292/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.111">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.112">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>b5712b997be1bdfef6bcdf0ff79c3677777894cb</Sha>
6+
<Sha>0900b585f72d5ee81844d776a421819dca6e3d05</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.111-servicing.24516.5">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.112-servicing.24555.9">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>b5712b997be1bdfef6bcdf0ff79c3677777894cb</Sha>
10+
<Sha>0900b585f72d5ee81844d776a421819dca6e3d05</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.111-servicing.24516.5">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.112-servicing.24555.9">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>b5712b997be1bdfef6bcdf0ff79c3677777894cb</Sha>
14+
<Sha>0900b585f72d5ee81844d776a421819dca6e3d05</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.11">
@@ -82,32 +82,32 @@
8282
<Sha>27f18656aab37d71839f562c0653afce07a2d2fd</Sha>
8383
<SourceBuild RepoName="format" ManagedOnly="true" />
8484
</Dependency>
85-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.24514.16">
85+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.24527.6">
8686
<Uri>https://github.com/dotnet/roslyn</Uri>
8787
<Sha>4ff64493649bd045ced204661958393dc5575e96</Sha>
8888
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
8989
</Dependency>
90-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-7.24514.16">
90+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-7.24527.6">
9191
<Uri>https://github.com/dotnet/roslyn</Uri>
9292
<Sha>4ff64493649bd045ced204661958393dc5575e96</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-7.24514.16">
94+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-7.24527.6">
9595
<Uri>https://github.com/dotnet/roslyn</Uri>
9696
<Sha>4ff64493649bd045ced204661958393dc5575e96</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.8.0-7.24514.16">
98+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.8.0-7.24527.6">
9999
<Uri>https://github.com/dotnet/roslyn</Uri>
100100
<Sha>4ff64493649bd045ced204661958393dc5575e96</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.8.0-7.24514.16">
102+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.8.0-7.24527.6">
103103
<Uri>https://github.com/dotnet/roslyn</Uri>
104104
<Sha>4ff64493649bd045ced204661958393dc5575e96</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0-7.24514.16">
106+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0-7.24527.6">
107107
<Uri>https://github.com/dotnet/roslyn</Uri>
108108
<Sha>4ff64493649bd045ced204661958393dc5575e96</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.8.0-7.24514.16">
110+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.8.0-7.24527.6">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112112
<Sha>4ff64493649bd045ced204661958393dc5575e96</Sha>
113113
</Dependency>
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24516.1">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24525.2">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
496+
<Sha>24e02f80c5458d1f75240ae57fc2a98fb8a9022a</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24516.1">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24525.2">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
501+
<Sha>24e02f80c5458d1f75240ae57fc2a98fb8a9022a</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24516.1">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24525.2">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
505+
<Sha>24e02f80c5458d1f75240ae57fc2a98fb8a9022a</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24516.1">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24525.2">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
509+
<Sha>24e02f80c5458d1f75240ae57fc2a98fb8a9022a</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3535
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3636
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
37-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24516.1</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24525.2</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -137,13 +137,13 @@
137137
</PropertyGroup>
138138
<PropertyGroup>
139139
<!-- Dependencies from https://github.com/dotnet/templating -->
140-
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.111</MicrosoftTemplateEngineAbstractionsPackageVersion>
140+
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.112</MicrosoftTemplateEngineAbstractionsPackageVersion>
141141
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
142142
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
143143
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
144144
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
145145
<!-- test dependencies -->
146-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.111-servicing.24516.5</MicrosoftTemplateEngineMocksPackageVersion>
146+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.112-servicing.24555.9</MicrosoftTemplateEngineMocksPackageVersion>
147147
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
148148
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
149149
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -154,13 +154,13 @@
154154
</PropertyGroup>
155155
<PropertyGroup>
156156
<!-- Dependencies from https://github.com/dotnet/roslyn -->
157-
<MicrosoftNetCompilersToolsetPackageVersion>4.8.0-7.24514.16</MicrosoftNetCompilersToolsetPackageVersion>
158-
<MicrosoftCodeAnalysisPackageVersion>4.8.0-7.24514.16</MicrosoftCodeAnalysisPackageVersion>
159-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.8.0-7.24514.16</MicrosoftCodeAnalysisCSharpPackageVersion>
160-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.8.0-7.24514.16</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
161-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.8.0-7.24514.16</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
162-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.8.0-7.24514.16</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
163-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.8.0-7.24514.16</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
157+
<MicrosoftNetCompilersToolsetPackageVersion>4.8.0-7.24527.6</MicrosoftNetCompilersToolsetPackageVersion>
158+
<MicrosoftCodeAnalysisPackageVersion>4.8.0-7.24527.6</MicrosoftCodeAnalysisPackageVersion>
159+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.8.0-7.24527.6</MicrosoftCodeAnalysisCSharpPackageVersion>
160+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.8.0-7.24527.6</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
161+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.8.0-7.24527.6</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
162+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.8.0-7.24527.6</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
163+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.8.0-7.24527.6</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
164164
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
165165
</PropertyGroup>
166166
<PropertyGroup>
@@ -209,7 +209,7 @@
209209
<PropertyGroup>
210210
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
211211
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
212-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24516.1</MicrosoftDotNetXUnitExtensionsVersion>
212+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24525.2</MicrosoftDotNetXUnitExtensionsVersion>
213213
<MoqPackageVersion>4.18.4</MoqPackageVersion>
214214
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
215215
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24516.1"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24525.2",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24525.2"
1919
}
2020
}

‎src/Tests/dotnet-new.Tests/Approvals/sample03.optional-page.EnableContactPage=true.verified/sample03/Program.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
using System.IO;
54
using Microsoft.AspNetCore.Hosting;
65

76
namespace sample03

‎src/Tests/dotnet-new.Tests/Approvals/sample03.optional-page.verified/sample03/Program.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
using System.IO;
54
using Microsoft.AspNetCore.Hosting;
65

76
namespace sample03

0 commit comments

Comments
 (0)