Skip to content

Commit fb3092b

Browse files
wtgodbewtgodbe
authored
Update nuget & msbuild versions (#31064)
* Update nuget & msbuild versions * Update RepoTasks.csproj * Fix one test * Fix all tests
1 parent 62b77d0 commit fb3092b

File tree

4 files changed

+37
-37
lines changed

4 files changed

+37
-37
lines changed

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,11 @@
182182
<MonoWebAssemblyInteropVersion>3.1.1-preview4.19614.4</MonoWebAssemblyInteropVersion>
183183
<!-- Partner teams -->
184184
<MicrosoftBclAsyncInterfacesVersion>1.0.0</MicrosoftBclAsyncInterfacesVersion>
185-
<MicrosoftBuildVersion>15.8.166</MicrosoftBuildVersion>
185+
<MicrosoftBuildVersion>16.9.0</MicrosoftBuildVersion>
186186
<MicrosoftAzureSignalRVersion>1.2.0</MicrosoftAzureSignalRVersion>
187-
<MicrosoftBuildFrameworkVersion>15.8.166</MicrosoftBuildFrameworkVersion>
187+
<MicrosoftBuildFrameworkVersion>16.9.0</MicrosoftBuildFrameworkVersion>
188188
<MicrosoftBuildLocatorVersion>1.2.6</MicrosoftBuildLocatorVersion>
189-
<MicrosoftBuildUtilitiesCoreVersion>15.8.166</MicrosoftBuildUtilitiesCoreVersion>
189+
<MicrosoftBuildUtilitiesCoreVersion>16.9.0</MicrosoftBuildUtilitiesCoreVersion>
190190
<MicrosoftCodeAnalysisCommonVersion>3.7.0</MicrosoftCodeAnalysisCommonVersion>
191191
<MicrosoftCodeAnalysisCSharpVersion>3.7.0</MicrosoftCodeAnalysisCSharpVersion>
192192
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>3.7.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
@@ -204,8 +204,8 @@
204204
<MicrosoftWebWebView2Version>1.0.705.50</MicrosoftWebWebView2Version>
205205
<MicrosoftWebXdtVersion>1.4.0</MicrosoftWebXdtVersion>
206206
<SystemIdentityModelTokensJwtVersion>6.8.0</SystemIdentityModelTokensJwtVersion>
207-
<NuGetVersioningVersion>5.9.0-rc.7121</NuGetVersioningVersion>
208-
<NuGetFrameworksVersion>5.9.0-rc.7121</NuGetFrameworksVersion>
207+
<NuGetVersioningVersion>5.9.0</NuGetVersioningVersion>
208+
<NuGetFrameworksVersion>5.9.0</NuGetFrameworksVersion>
209209
<SystemNetExperimentalMsQuicVersion>5.0.0-alpha.20560.6</SystemNetExperimentalMsQuicVersion>
210210
<!-- Packages from 2.1, 3.1, and 5.0 branches used for site extension build. -->
211211
<MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>

‎eng/tools/RepoTasks/RepoTasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="NuGet.Packaging" Version="5.8.0" />
18+
<PackageReference Include="NuGet.Packaging" Version="5.9.0" />
1919
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
2020
</ItemGroup>
2121

‎src/Tools/Extensions.ApiDescription.Client/test/GetOpenApiReferenceMetadataTest.cs

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ public void Execute_AddsExpectedMetadata()
3737
{ "OutputPath", outputPath },
3838
{
3939
"SerializedMetadata",
40-
$"Identity={identity}|CodeGenerator=NSwagCSharp|" +
41-
$"OriginalItemSpec={identity}|FirstForGenerator=true|" +
42-
$"OutputPath={outputPath}|ClassName=NSwagClient|Namespace={@namespace}"
40+
$"Identity={identity}|FirstForGenerator=true|" +
41+
$"CodeGenerator=NSwagCSharp|OutputPath={outputPath}|Namespace={@namespace}|" +
42+
$"OriginalItemSpec={identity}|ClassName=NSwagClient"
4343
},
4444
};
4545

@@ -95,9 +95,9 @@ public void Execute_DoesNotOverrideClassName()
9595
{ "OutputPath", outputPath },
9696
{
9797
"SerializedMetadata",
98-
$"Identity={identity}|CodeGenerator=NSwagCSharp|" +
99-
$"ClassName={className}|OriginalItemSpec={identity}|FirstForGenerator=true|" +
100-
$"OutputPath={outputPath}|Namespace={@namespace}"
98+
$"Identity={identity}|FirstForGenerator=true|" +
99+
$"CodeGenerator=NSwagCSharp|OutputPath={outputPath}|Namespace={@namespace}|" +
100+
$"OriginalItemSpec={identity}|ClassName={className}"
101101
},
102102
};
103103

@@ -153,9 +153,9 @@ public void Execute_DoesNotOverrideNamespace()
153153
{ "OutputPath", outputPath },
154154
{
155155
"SerializedMetadata",
156-
$"Identity={identity}|CodeGenerator=NSwagCSharp|" +
157-
$"Namespace={@namespace}|OriginalItemSpec={identity}|FirstForGenerator=true|" +
158-
$"OutputPath={outputPath}|ClassName=NSwagClient"
156+
$"Identity={identity}|FirstForGenerator=true|" +
157+
$"CodeGenerator=NSwagCSharp|OutputPath={outputPath}|Namespace={@namespace}|" +
158+
$"OriginalItemSpec={identity}|ClassName=NSwagClient"
159159
},
160160
};
161161

@@ -211,9 +211,9 @@ public void Execute_DoesNotOverrideOutputPath_IfRooted()
211211
{ "OutputPath", outputPath },
212212
{
213213
"SerializedMetadata",
214-
$"Identity={identity}|CodeGenerator=NSwagCSharp|" +
215-
$"OutputPath={outputPath}|OriginalItemSpec={identity}|FirstForGenerator=true|" +
216-
$"ClassName={className}|Namespace={@namespace}"
214+
$"Identity={identity}|FirstForGenerator=true|" +
215+
$"CodeGenerator=NSwagCSharp|OutputPath={outputPath}|Namespace={@namespace}|" +
216+
$"OriginalItemSpec={identity}|ClassName={className}"
217217
},
218218
};
219219

@@ -361,9 +361,9 @@ public void Execute_SetsClassName_BasedOnOutputPath()
361361
{ "OutputPath", expectedOutputPath },
362362
{
363363
"SerializedMetadata",
364-
$"Identity={identity}|CodeGenerator=NSwagCSharp|" +
365-
$"OutputPath={expectedOutputPath}|OriginalItemSpec={identity}|FirstForGenerator=true|" +
366-
$"ClassName={className}|Namespace={@namespace}"
364+
$"Identity={identity}|FirstForGenerator=true|" +
365+
$"CodeGenerator=NSwagCSharp|OutputPath={expectedOutputPath}|Namespace={@namespace}|" +
366+
$"OriginalItemSpec={identity}|ClassName={className}"
367367
},
368368
};
369369

@@ -424,9 +424,9 @@ public void Execute_SetsClassName_BasedOnSanitizedOutputPath(string outputPath,
424424
{ "OutputPath", expectedOutputPath },
425425
{
426426
"SerializedMetadata",
427-
$"Identity={identity}|CodeGenerator=NSwagCSharp|" +
428-
$"OutputPath={expectedOutputPath}|OriginalItemSpec={identity}|FirstForGenerator=true|" +
429-
$"ClassName={className}|Namespace={@namespace}"
427+
$"Identity={identity}|FirstForGenerator=true|" +
428+
$"CodeGenerator=NSwagCSharp|OutputPath={expectedOutputPath}|Namespace={@namespace}|" +
429+
$"OriginalItemSpec={identity}|ClassName={className}"
430430
},
431431
};
432432

@@ -491,9 +491,9 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
491491
{ "OutputPath", outputPath1 },
492492
{
493493
"SerializedMetadata",
494-
$"Identity={identity12}|CodeGenerator={codeGenerator13}|" +
495-
$"OriginalItemSpec={identity12}|FirstForGenerator=true|" +
496-
$"OutputPath={outputPath1}|ClassName={className12}|Namespace={@namespace}"
494+
$"Identity={identity12}|FirstForGenerator=true|" +
495+
$"CodeGenerator={codeGenerator13}|OutputPath={outputPath1}|Namespace={@namespace}|" +
496+
$"OriginalItemSpec={identity12}|ClassName={className12}"
497497
},
498498
};
499499
var expectedMetadata2 = new SortedDictionary<string, string>(StringComparer.Ordinal)
@@ -506,9 +506,9 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
506506
{ "OutputPath", outputPath2 },
507507
{
508508
"SerializedMetadata",
509-
$"Identity={identity12}|CodeGenerator={codeGenerator2}|" +
510-
$"OriginalItemSpec={identity12}|FirstForGenerator=true|" +
511-
$"OutputPath={outputPath2}|ClassName={className12}|Namespace={@namespace}"
509+
$"Identity={identity12}|FirstForGenerator=true|" +
510+
$"CodeGenerator={codeGenerator2}|OutputPath={outputPath2}|Namespace={@namespace}|" +
511+
$"OriginalItemSpec={identity12}|ClassName={className12}"
512512
},
513513
};
514514
var expectedMetadata3 = new SortedDictionary<string, string>(StringComparer.Ordinal)
@@ -521,9 +521,9 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
521521
{ "OutputPath", outputPath3 },
522522
{
523523
"SerializedMetadata",
524-
$"Identity={identity3}|CodeGenerator={codeGenerator13}|" +
525-
$"OriginalItemSpec={identity3}|FirstForGenerator=false|" +
526-
$"OutputPath={outputPath3}|ClassName={className3}|Namespace={@namespace}"
524+
$"Identity={identity3}|FirstForGenerator=false|" +
525+
$"CodeGenerator={codeGenerator13}|OutputPath={outputPath3}|Namespace={@namespace}|" +
526+
$"OriginalItemSpec={identity3}|ClassName={className3}"
527527
},
528528
};
529529

‎src/Tools/Extensions.ApiDescription.Client/test/MetadataSerializerTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,10 @@ public void SerializeMetadata_ReturnsExpectedString()
185185
};
186186

187187
var input = new TaskItem(identity, metadata);
188-
var expectedResult = $"Identity={identity}|ClassName=azureMonitorClient|" +
189-
"CodeGenerator=NSwagCSharp|FirstForGenerator=true|Namespace=ConsoleClient|" +
190-
"Options=|OriginalItemSpec=../files/azureMonitor.json|" +
191-
"OutputPath=C:\\dd\\dnx\\AspNetCore\\artifacts\\obj\\ConsoleClient\\azureMonitorClient.cs";
188+
var expectedResult = $"Identity={identity}|FirstForGenerator=true|" +
189+
"Options=|CodeGenerator=NSwagCSharp|" +
190+
"OutputPath=C:\\dd\\dnx\\AspNetCore\\artifacts\\obj\\ConsoleClient\\azureMonitorClient.cs|" +
191+
"Namespace=ConsoleClient|OriginalItemSpec=../files/azureMonitor.json|ClassName=azureMonitorClient";
192192

193193
// Act
194194
var result = MetadataSerializer.SerializeMetadata(input);

0 commit comments

Comments
 (0)