Skip to content

Commit ff9e10f

Browse files
NikolaMilosavljevicNikolaMilosavljevic
authored
Merge branch 'main' into new.installer.infra
2 parents 60bd7c5 + a164e6a commit ff9e10f

9 files changed

+260
-255
lines changed

‎Directory.Packages.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
6868
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
6969
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
70-
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.9" />
70+
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.23" />
7171
<PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
7272
<PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
7373
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />

‎eng/Version.Details.xml

+133-133
Large diffs are not rendered by default.

‎eng/Versions.props

+46-46
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<PropertyGroup>
101101
<!-- Dependency from https://github.com/dotnet/test-templates -->
102102
<!-- Supported versions -->
103-
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rtm.24570.2</MicrosoftDotNetTestProjectTemplates90PackageVersion>
103+
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rtm.24575.3</MicrosoftDotNetTestProjectTemplates90PackageVersion>
104104
</PropertyGroup>
105105
<PropertyGroup>
106106
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -153,24 +153,24 @@
153153
</PropertyGroup>
154154
<PropertyGroup>
155155
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
156-
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24572.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
157-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24572.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
158-
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24572.1</MicrosoftWindowsDesktopAppRefPackageVersion>
156+
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24572.3</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
157+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24572.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
158+
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24572.3</MicrosoftWindowsDesktopAppRefPackageVersion>
159159
</PropertyGroup>
160160
<PropertyGroup>
161161
<!-- Dependencies from https://github.com/nuget/nuget.client -->
162-
<NuGetBuildTasksPackageVersion>6.13.0-preview.1.62</NuGetBuildTasksPackageVersion>
163-
<NuGetBuildTasksConsolePackageVersion>6.13.0-preview.1.62</NuGetBuildTasksConsolePackageVersion>
164-
<NuGetLocalizationPackageVersion>6.13.0-preview.1.62</NuGetLocalizationPackageVersion>
165-
<NuGetBuildTasksPackPackageVersion>6.13.0-preview.1.62</NuGetBuildTasksPackPackageVersion>
166-
<NuGetCommandLineXPlatPackageVersion>6.13.0-preview.1.62</NuGetCommandLineXPlatPackageVersion>
167-
<NuGetProjectModelPackageVersion>6.13.0-preview.1.62</NuGetProjectModelPackageVersion>
168-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.0-preview.1.62</MicrosoftBuildNuGetSdkResolverPackageVersion>
169-
<NuGetCommonPackageVersion>6.13.0-preview.1.62</NuGetCommonPackageVersion>
170-
<NuGetConfigurationPackageVersion>6.13.0-preview.1.62</NuGetConfigurationPackageVersion>
171-
<NuGetFrameworksPackageVersion>6.13.0-preview.1.62</NuGetFrameworksPackageVersion>
172-
<NuGetPackagingPackageVersion>6.13.0-preview.1.62</NuGetPackagingPackageVersion>
173-
<NuGetVersioningPackageVersion>6.13.0-preview.1.62</NuGetVersioningPackageVersion>
162+
<NuGetBuildTasksPackageVersion>6.13.0-preview.1.71</NuGetBuildTasksPackageVersion>
163+
<NuGetBuildTasksConsolePackageVersion>6.13.0-preview.1.71</NuGetBuildTasksConsolePackageVersion>
164+
<NuGetLocalizationPackageVersion>6.13.0-preview.1.71</NuGetLocalizationPackageVersion>
165+
<NuGetBuildTasksPackPackageVersion>6.13.0-preview.1.71</NuGetBuildTasksPackPackageVersion>
166+
<NuGetCommandLineXPlatPackageVersion>6.13.0-preview.1.71</NuGetCommandLineXPlatPackageVersion>
167+
<NuGetProjectModelPackageVersion>6.13.0-preview.1.71</NuGetProjectModelPackageVersion>
168+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.0-preview.1.71</MicrosoftBuildNuGetSdkResolverPackageVersion>
169+
<NuGetCommonPackageVersion>6.13.0-preview.1.71</NuGetCommonPackageVersion>
170+
<NuGetConfigurationPackageVersion>6.13.0-preview.1.71</NuGetConfigurationPackageVersion>
171+
<NuGetFrameworksPackageVersion>6.13.0-preview.1.71</NuGetFrameworksPackageVersion>
172+
<NuGetPackagingPackageVersion>6.13.0-preview.1.71</NuGetPackagingPackageVersion>
173+
<NuGetVersioningPackageVersion>6.13.0-preview.1.71</NuGetVersioningPackageVersion>
174174
</PropertyGroup>
175175
<PropertyGroup>
176176
<!-- Dependencies from https://github.com/Microsoft/vstest -->
@@ -180,8 +180,8 @@
180180
</PropertyGroup>
181181
<PropertyGroup>
182182
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
183-
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.24559.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
184-
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.24559.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
183+
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.24574.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
184+
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.24574.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
185185
</PropertyGroup>
186186
<PropertyGroup>
187187
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
@@ -204,13 +204,13 @@
204204
</PropertyGroup>
205205
<PropertyGroup>
206206
<!-- Dependencies from https://github.com/dotnet/templating -->
207-
<MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-alpha.1.24571.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
207+
<MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-alpha.1.24574.2</MicrosoftTemplateEngineAbstractionsPackageVersion>
208208
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
209209
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
210210
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
211211
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
212212
<!-- test dependencies -->
213-
<MicrosoftTemplateEngineMocksPackageVersion>10.0.100-alpha.1.24571.1</MicrosoftTemplateEngineMocksPackageVersion>
213+
<MicrosoftTemplateEngineMocksPackageVersion>10.0.100-alpha.1.24574.2</MicrosoftTemplateEngineMocksPackageVersion>
214214
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
215215
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
216216
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -232,25 +232,25 @@
232232
</PropertyGroup>
233233
<PropertyGroup>
234234
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
235-
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24572.1</MicrosoftAspNetCoreAppRefPackageVersion>
236-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24572.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
237-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24572.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
238-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24572.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
239-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24572.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
240-
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24572.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
241-
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24572.1</MicrosoftAspNetCoreTestHostPackageVersion>
242-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24572.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
243-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24572.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
244-
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24572.1</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
245-
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24572.1</dotnetdevcertsPackageVersion>
246-
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24572.1</dotnetuserjwtsPackageVersion>
247-
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24572.1</dotnetusersecretsPackageVersion>
235+
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24572.6</MicrosoftAspNetCoreAppRefPackageVersion>
236+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24572.6</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
237+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24572.6</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
238+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24572.6</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
239+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24572.6</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
240+
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24572.6</MicrosoftAspNetCoreAnalyzersPackageVersion>
241+
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24572.6</MicrosoftAspNetCoreTestHostPackageVersion>
242+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24572.6</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
243+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24572.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
244+
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24572.6</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
245+
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24572.6</dotnetdevcertsPackageVersion>
246+
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24572.6</dotnetuserjwtsPackageVersion>
247+
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24572.6</dotnetusersecretsPackageVersion>
248248
</PropertyGroup>
249249
<PropertyGroup>
250250
<!-- Dependencies from https://github.com/dotnet/razor -->
251-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24571.2</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
252-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24571.2</MicrosoftCodeAnalysisRazorToolingInternalVersion>
253-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24571.2</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
251+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24574.8</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
252+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24574.8</MicrosoftCodeAnalysisRazorToolingInternalVersion>
253+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24574.8</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
254254
</PropertyGroup>
255255
<PropertyGroup>
256256
<!-- Dependencies from https://github.com/dotnet/wpf -->
@@ -274,19 +274,19 @@
274274
</PropertyGroup>
275275
<PropertyGroup>
276276
<!-- Dependencies from https://github.com/dotnet/arcade -->
277-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24570.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
278-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24570.4</MicrosoftDotNetSignToolVersion>
279-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24570.4</MicrosoftDotNetXliffTasksVersion>
280-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24570.4</MicrosoftDotNetXUnitExtensionsVersion>
277+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24572.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
278+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24572.3</MicrosoftDotNetSignToolVersion>
279+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24572.3</MicrosoftDotNetXliffTasksVersion>
280+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24572.3</MicrosoftDotNetXUnitExtensionsVersion>
281281
</PropertyGroup>
282282
<PropertyGroup>
283283
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
284-
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24569.2</MicrosoftBuildTasksGitVersion>
285-
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24569.2</MicrosoftSourceLinkCommonVersion>
286-
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24569.2</MicrosoftSourceLinkAzureReposGitVersion>
287-
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24569.2</MicrosoftSourceLinkGitHubVersion>
288-
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24569.2</MicrosoftSourceLinkGitLabVersion>
289-
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24569.2</MicrosoftSourceLinkBitbucketGitVersion>
284+
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24574.1</MicrosoftBuildTasksGitVersion>
285+
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24574.1</MicrosoftSourceLinkCommonVersion>
286+
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24574.1</MicrosoftSourceLinkAzureReposGitVersion>
287+
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24574.1</MicrosoftSourceLinkGitHubVersion>
288+
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24574.1</MicrosoftSourceLinkGitLabVersion>
289+
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24574.1</MicrosoftSourceLinkBitbucketGitVersion>
290290
</PropertyGroup>
291291
<!-- Get .NET Framework reference assemblies from NuGet packages -->
292292
<PropertyGroup>

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24570.4",
21-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24570.4",
20+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24572.3",
21+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24572.3",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎src/Tasks/Microsoft.NET.Build.Tasks/GenerateGlobalUsings.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ protected override void ExecuteCore()
4646
.Append(" = ");
4747
}
4848

49-
lineBuilder.Append("global::")
50-
.Append(@using.Namespace)
49+
lineBuilder.Append(@using.Namespace)
5150
.Append(';');
5251

5352
lines[index++] = lineBuilder.ToString();

‎test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateGlobalUsings_BlazorWasm.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ public void It_generates_blazorwasm_usings_and_builds_successfully()
2828

2929
File.ReadAllText(Path.Combine(outputDirectory.FullName, globalUsingsFileName)).Should().Be(
3030
@"// <auto-generated/>
31-
global using global::Microsoft.Extensions.Configuration;
32-
global using global::Microsoft.Extensions.DependencyInjection;
33-
global using global::Microsoft.Extensions.Logging;
34-
global using global::System;
35-
global using global::System.Collections.Generic;
36-
global using global::System.IO;
37-
global using global::System.Linq;
38-
global using global::System.Net.Http;
39-
global using global::System.Threading;
40-
global using global::System.Threading.Tasks;
31+
global using Microsoft.Extensions.Configuration;
32+
global using Microsoft.Extensions.DependencyInjection;
33+
global using Microsoft.Extensions.Logging;
34+
global using System;
35+
global using System.Collections.Generic;
36+
global using System.IO;
37+
global using System.Linq;
38+
global using System.Net.Http;
39+
global using System.Threading;
40+
global using System.Threading.Tasks;
4141
");
4242
}
4343

‎test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateGlobalUsings_DotNet.cs

+40-34
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ public void It_can_generate_global_usings_and_builds_successfully()
2828

2929
File.ReadAllText(Path.Combine(outputDirectory.FullName, globalUsingsFileName)).Should().Be(
3030
@"// <auto-generated/>
31-
global using global::System;
32-
global using global::System.Collections.Generic;
33-
global using global::System.IO;
34-
global using global::System.Linq;
35-
global using global::System.Net.Http;
36-
global using global::System.Threading;
37-
global using global::System.Threading.Tasks;
31+
global using System;
32+
global using System.Collections.Generic;
33+
global using System.IO;
34+
global using System.Linq;
35+
global using System.Net.Http;
36+
global using System.Threading;
37+
global using System.Threading.Tasks;
3838
");
3939
}
4040

@@ -80,12 +80,12 @@ public void It_can_remove_specific_usings_in_project_file()
8080

8181
File.ReadAllText(Path.Combine(outputDirectory.FullName, globalUsingsFileName)).Should().Be(
8282
@"// <auto-generated/>
83-
global using global::System;
84-
global using global::System.Collections.Generic;
85-
global using global::System.Linq;
86-
global using global::System.Net.Http;
87-
global using global::System.Threading;
88-
global using global::System.Threading.Tasks;
83+
global using System;
84+
global using System.Collections.Generic;
85+
global using System.Linq;
86+
global using System.Net.Http;
87+
global using System.Threading;
88+
global using System.Threading.Tasks;
8989
");
9090
}
9191

@@ -103,6 +103,9 @@ public void It_can_generate_custom_usings()
103103
<Using Include=""CustomNamespace"" />
104104
<Using Include=""TestStaticNamespace"" Static=""True"" />
105105
<Using Include=""System.Biology"" Alias=""AppliedChemistry"" />
106+
<Using Include=""(System.String X, int Y)"" Alias=""MyTuple"" />
107+
<Using Include=""dynamic"" Alias=""Any"" />
108+
<Using Include=""int"" Alias=""Number"" />
106109
</ItemGroup>"));
107110
});
108111

@@ -121,9 +124,12 @@ public void It_can_generate_custom_usings()
121124

122125
File.ReadAllText(Path.Combine(outputDirectory.FullName, globalUsingsFileName)).Should().Be(
123126
@"// <auto-generated/>
124-
global using global::CustomNamespace;
125-
global using AppliedChemistry = global::System.Biology;
126-
global using static global::TestStaticNamespace;
127+
global using CustomNamespace;
128+
global using Any = dynamic;
129+
global using AppliedChemistry = System.Biology;
130+
global using MyTuple = (System.String X, int Y);
131+
global using Number = int;
132+
global using static TestStaticNamespace;
127133
");
128134
}
129135

@@ -164,11 +170,11 @@ public void It_considers_switches_when_deduping()
164170

165171
File.ReadAllText(Path.Combine(outputDirectory.FullName, globalUsingsFileName)).Should().Be(
166172
@"// <auto-generated/>
167-
global using global::CustomNamespace;
168-
global using global::TestStaticNamespace;
169-
global using Disk = global::System.IO.File;
170-
global using FileIO = global::System.IO.File;
171-
global using static global::TestStaticNamespace;
173+
global using CustomNamespace;
174+
global using TestStaticNamespace;
175+
global using Disk = System.IO.File;
176+
global using FileIO = System.IO.File;
177+
global using static TestStaticNamespace;
172178
");
173179
}
174180

@@ -202,13 +208,13 @@ public void It_can_persist_generatedfile_between_cleans()
202208
outputDirectory.Should().HaveFile(globalUsingsFileName);
203209
File.ReadAllText(Path.Combine(outputDirectory.FullName, globalUsingsFileName)).Should().Be(
204210
@"// <auto-generated/>
205-
global using global::System;
206-
global using global::System.Collections.Generic;
207-
global using global::System.IO;
208-
global using global::System.Linq;
209-
global using global::System.Net.Http;
210-
global using global::System.Threading;
211-
global using global::System.Threading.Tasks;
211+
global using System;
212+
global using System.Collections.Generic;
213+
global using System.IO;
214+
global using System.Linq;
215+
global using System.Net.Http;
216+
global using System.Threading;
217+
global using System.Threading.Tasks;
212218
");
213219
}
214220

@@ -234,12 +240,12 @@ public void It_not_generate_global_usings_for_system_net_http_when_multitarget()
234240

235241
File.ReadAllText(Path.Combine(outputDirectory.FullName, globalUsingsFileName)).Should().Be(
236242
@"// <auto-generated/>
237-
global using global::System;
238-
global using global::System.Collections.Generic;
239-
global using global::System.IO;
240-
global using global::System.Linq;
241-
global using global::System.Threading;
242-
global using global::System.Threading.Tasks;
243+
global using System;
244+
global using System.Collections.Generic;
245+
global using System.IO;
246+
global using System.Linq;
247+
global using System.Threading;
248+
global using System.Threading.Tasks;
243249
");
244250
}
245251

0 commit comments

Comments
 (0)