Skip to content

Commit 6e853ab

Browse files
JoeRobichJoeRobich
authored
Merge branch 'main' into dev/jorobich/update-editorconfig-template
2 parents 5a82aa4 + 6fddf4a commit 6e853ab

File tree

1,603 files changed

+13719
-2012
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,603 files changed

+13719
-2012
lines changed

‎CODEOWNERS

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414
# Area-AspNetCore
1515
/src/BlazorWasmSdk/ @dotnet/aspnet-blazor-eng
1616
/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/ @dotnet/aspnet-blazor-eng
17-
/src/Assets/TestProjects/BlazorHosted/ @dotnet/aspnet-blazor-eng
18-
/src/Assets/TestProjects/BlazorHostedRID/ @dotnet/aspnet-blazor-eng
19-
/src/Assets/TestProjects/BlazorWasmMinimal/ @dotnet/aspnet-blazor-eng
20-
/src/Assets/TestProjects/BlazorWasmWithLibrary/ @dotnet/aspnet-blazor-eng
17+
/test/TestAssets/TestProjects/BlazorHosted/ @dotnet/aspnet-blazor-eng
18+
/test/TestAssets/TestProjects/BlazorHostedRID/ @dotnet/aspnet-blazor-eng
19+
/test/TestAssets/TestProjects/BlazorWasmMinimal/ @dotnet/aspnet-blazor-eng
20+
/test/TestAssets/TestProjects/BlazorWasmWithLibrary/ @dotnet/aspnet-blazor-eng
2121
/src/RazorSdk/ @dotnet/razor-compiler
2222
/test/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/ @dotnet/aspnet-blazor-eng
2323
/test/Microsoft.NET.Sdk.Razor.Tests/ @dotnet/razor-compiler
2424
/test/Microsoft.NET.Sdk.Razor.Tool.Tests/ @dotnet/razor-compiler
25-
/src/Assets/TestPackages/PackageLibraryDirectDependency/ @dotnet/aspnet-blazor-eng
26-
/src/Assets/TestPackages/PackageLibraryTransitiveDependency/ @dotnet/aspnet-blazor-eng
27-
/src/src/Assets/TestProjects/Razor*/ @dotnet/razor-compiler
25+
/test/TestAssets/TestPackages/PackageLibraryDirectDependency/ @dotnet/aspnet-blazor-eng
26+
/test/TestAssets/TestPackages/PackageLibraryTransitiveDependency/ @dotnet/aspnet-blazor-eng
27+
/test/TestAssets/TestProjects/Razor*/ @dotnet/razor-compiler
2828

2929
# Area-Wasm
3030
/src/WasmSdk @lewing @akoeplinger @pavelsavara @maraf
@@ -72,7 +72,7 @@
7272
/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ClickOnce.targets @sujitnayak
7373

7474
# Area-Watch
75-
/src/Assets/TestProjects/Watch*/ @tmat @arkalyanms @dotnet/roslyn-ide
75+
/test/TestAssets/TestProjects/Watch*/ @tmat @arkalyanms @dotnet/roslyn-ide
7676
/test/dotnet-watch.Tests/ @tmat @arkalyanms @dotnet/roslyn-ide
7777
/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/ @dotnet/aspnet-blazor-eng
7878
/src/BuiltInTools/* @tmat @arkalyanms @dotnet/roslyn-ide

‎TemplateEngine.slnf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"solution": {
33
"path": "sdk.sln",
44
"projects": [
5-
"src\\Assets\\TestPackages\\dotnet-new\\Microsoft.TemplateEngine.TestTemplates.csproj",
5+
"test\\TestAssets\\TestPackages\\dotnet-new\\Microsoft.TemplateEngine.TestTemplates.csproj",
66
"src\\Cli\\Microsoft.DotNet.Cli.Sln.Internal\\Microsoft.DotNet.Cli.Sln.Internal.csproj",
77
"src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj",
88
"src\\Cli\\Microsoft.DotNet.Configurer\\Microsoft.DotNet.Configurer.csproj",

‎build/RunTestsOnHelix.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ robocopy %HELIX_CORRELATION_PAYLOAD%\t\TestExecutionDirectoryFiles %TestExecutio
2828

2929
set DOTNET_SDK_TEST_EXECUTION_DIRECTORY=%TestExecutionDirectory%
3030
set DOTNET_SDK_TEST_MSBUILDSDKRESOLVER_FOLDER=%HELIX_CORRELATION_PAYLOAD%\r
31-
set DOTNET_SDK_TEST_ASSETS_DIRECTORY=%TestExecutionDirectory%\assets
31+
set DOTNET_SDK_TEST_ASSETS_DIRECTORY=%TestExecutionDirectory%\TestAssets
3232

3333
REM call dotnet new so the first run message doesn't interfere with the first test
3434
dotnet new --debug:ephemeral-hive

‎build/RunTestsOnHelix.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ cp -a $HELIX_CORRELATION_PAYLOAD/t/TestExecutionDirectoryFiles/. $TestExecutionD
1616

1717
export DOTNET_SDK_TEST_EXECUTION_DIRECTORY=$TestExecutionDirectory
1818
export DOTNET_SDK_TEST_MSBUILDSDKRESOLVER_FOLDER=$HELIX_CORRELATION_PAYLOAD/r
19-
export DOTNET_SDK_TEST_ASSETS_DIRECTORY=$TestExecutionDirectory/Assets
19+
export DOTNET_SDK_TEST_ASSETS_DIRECTORY=$TestExecutionDirectory/TestAssets
2020

2121
# call dotnet new so the first run message doesn't interfere with the first test
2222
dotnet new --debug:ephemeral-hive

‎eng/ManualVersions.props

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
Basically: In this file, choose the highest version when resolving merge conflicts.
1010
-->
1111
<PropertyGroup>
12-
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.31</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13-
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.31</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14-
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.31</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15-
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.31</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16-
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.31</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17-
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.31</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
12+
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.34</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13+
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.34</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14+
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.34</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15+
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.34</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16+
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.34</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17+
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.34</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
18+
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.34</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
1819
</PropertyGroup>
1920

2021
</Project>

‎eng/Publishing.props

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,19 +88,6 @@
8888
</ItemGroup>
8989
</Target>
9090

91-
<!-- Similarly to FSharp above, Roslyn needs to publish its Framework.Toolset package alongside SDK
92-
so it can be picked up in BuildWithNetFrameworkHostedCompiler scenarios. -->
93-
<PropertyGroup>
94-
<PublishDependsOnTargets>$(PublishDependsOnTargets);_ResolvePublishRoslynNuGetPackages</PublishDependsOnTargets>
95-
</PropertyGroup>
96-
97-
<Target Name="_ResolvePublishRoslynNuGetPackages" Condition="'$(EnableDefaultArtifacts)' == 'true'">
98-
<ItemGroup>
99-
<RoslynPackagesToPush Include="$(NuGetPackageRoot)\Microsoft.Net.Compilers.Toolset.Framework\$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)\*.nupkg" />
100-
<ItemsToPushToBlobFeed Include="@(RoslynPackagesToPush)" IsShipping="true" />
101-
</ItemGroup>
102-
</Target>
103-
10491
<!-- We use a separate target to publish this to blob storage so that we can push this to a relative path inside the blob storage. -->
10592
<Target Name="PublishToolsetAssets" DependsOnTargets="ReadToolsetVersion" BeforeTargets="Publish" Condition="'$(EnableDefaultArtifacts)' == 'true'">
10693
<ItemGroup>

0 commit comments

Comments
 (0)