Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd56a97f

Browse files
authored
Rename Formatting projects and more (#392)
* Rename `netstandard` Formatting projects - Formatting.NetCore and Formatting.NetStandard names no longer make sense* Adjust `netstandard` Formatting output paths - align w/ new project names* Use `NETSTANDARD1_3` and `Testing_NetStandard1_3` - `NETFX_CORE` name no longer makes much sense - remove both `NETFX_CORE` C# defined constant and `msbuild` property - manually-defined constant completely unnecessary in src/ code* Remove RuntimePortable.sln - solution name no longer makes much sense and division adds little or no value - add .NET Standard projects to Runtime.sln - add solution filters for .NET Framework and .NET Standard projects - remove `$(BuildPortable)` property and `@(SolutionsToBuild)` item group
1 parenteae75d6 commitd56a97f

File tree

50 files changed

+285
-270
lines changed

Some content is hidden

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

50 files changed

+285
-270
lines changed

‎.codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
-script:.\build.cmd EnableSkipStrongNames
5858
displayName:Windows Build - EnableSkipStrongNames
5959

60-
-script:.\build.cmd Build /p:BuildPortable=true
60+
-script:.\build.cmd Build
6161
displayName:Windows Build
6262

6363
-task:CodeQL3000Finalize@0

‎Runtime.NetFramework.slnf

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{
2+
"solution": {
3+
"path": "Runtime.sln",
4+
"projects": [
5+
"src\\Microsoft.AspNet.Facebook\\Microsoft.AspNet.Facebook.csproj",
6+
"src\\Microsoft.Web.Helpers\\Microsoft.Web.Helpers.csproj",
7+
"src\\Microsoft.Web.Mvc\\Microsoft.Web.Mvc.csproj",
8+
"src\\Microsoft.Web.WebPages.OAuth\\Microsoft.Web.WebPages.OAuth.csproj",
9+
"src\\System.Net.Http.Formatting\\System.Net.Http.Formatting.csproj",
10+
"src\\System.Web.Cors\\System.Web.Cors.csproj",
11+
"src\\System.Web.Helpers\\System.Web.Helpers.csproj",
12+
"src\\System.Web.Http.Cors\\System.Web.Http.Cors.csproj",
13+
"src\\System.Web.Http.Owin\\System.Web.Http.Owin.csproj",
14+
"src\\System.Web.Http.SelfHost\\System.Web.Http.SelfHost.csproj",
15+
"src\\System.Web.Http.SignalR\\System.Web.Http.SignalR.csproj",
16+
"src\\System.Web.Http.Tracing\\System.Web.Http.Tracing.csproj",
17+
"src\\System.Web.Http.WebHost\\System.Web.Http.WebHost.csproj",
18+
"src\\System.Web.Http\\System.Web.Http.csproj",
19+
"src\\System.Web.Mvc\\System.Web.Mvc.csproj",
20+
"src\\System.Web.Razor\\System.Web.Razor.csproj",
21+
"src\\System.Web.WebPages.Administration\\System.Web.WebPages.Administration.csproj",
22+
"src\\System.Web.WebPages.Deployment\\System.Web.WebPages.Deployment.csproj",
23+
"src\\System.Web.WebPages.Razor\\System.Web.WebPages.Razor.csproj",
24+
"src\\System.Web.WebPages\\System.Web.WebPages.csproj",
25+
"src\\WebApiHelpPage\\VB\\WebApiHelpPageVB.vbproj",
26+
"src\\WebApiHelpPage\\WebApiHelpPage.csproj",
27+
"src\\WebMatrix.Data\\WebMatrix.Data.csproj",
28+
"src\\WebMatrix.WebData\\WebMatrix.WebData.csproj",
29+
"test\\Microsoft.AspNet.Facebook.Test\\Microsoft.AspNet.Facebook.Test.csproj",
30+
"test\\Microsoft.TestCommon\\Microsoft.TestCommon.csproj",
31+
"test\\Microsoft.Web.Helpers.Test\\Microsoft.Web.Helpers.Test.csproj",
32+
"test\\Microsoft.Web.Mvc.Test\\Microsoft.Web.Mvc.Test.csproj",
33+
"test\\Microsoft.Web.WebPages.OAuth.Test\\Microsoft.Web.WebPages.OAuth.Test.csproj",
34+
"test\\System.Net.Http.Formatting.Test\\System.Net.Http.Formatting.Test.csproj",
35+
"test\\System.Web.Cors.Test\\System.Web.Cors.Test.csproj",
36+
"test\\System.Web.Helpers.Test\\System.Web.Helpers.Test.csproj",
37+
"test\\System.Web.Http.Cors.Test\\System.Web.Http.Cors.Test.csproj",
38+
"test\\System.Web.Http.Integration.Test\\System.Web.Http.Integration.Test.csproj",
39+
"test\\System.Web.Http.Owin.Test\\System.Web.Http.Owin.Test.csproj",
40+
"test\\System.Web.Http.SelfHost.Test\\System.Web.Http.SelfHost.Test.csproj",
41+
"test\\System.Web.Http.SignalR.Test\\System.Web.Http.SignalR.Test.csproj",
42+
"test\\System.Web.Http.Test\\System.Web.Http.Test.csproj",
43+
"test\\System.Web.Http.Tracing.Test\\System.Web.Http.Tracing.Test.csproj",
44+
"test\\System.Web.Http.WebHost.Test\\System.Web.Http.WebHost.Test.csproj",
45+
"test\\System.Web.Mvc.Test\\System.Web.Mvc.Test.csproj",
46+
"test\\System.Web.Razor.Test\\System.Web.Razor.Test.csproj",
47+
"test\\System.Web.WebPages.Administration.Test\\System.Web.WebPages.Administration.Test.csproj",
48+
"test\\System.Web.WebPages.Deployment.Test\\System.Web.WebPages.Deployment.Test.csproj",
49+
"test\\System.Web.WebPages.Razor.Test\\System.Web.WebPages.Razor.Test.csproj",
50+
"test\\System.Web.WebPages.Test\\System.Web.WebPages.Test.csproj",
51+
"test\\WebApiHelpPage.Test\\WebApiHelpPage.Test.csproj",
52+
"test\\WebApiHelpPage.VB.Test\\WebApiHelpPage.VB.Test.csproj",
53+
"test\\WebMatrix.Data.Test\\WebMatrix.Data.Test.csproj",
54+
"test\\WebMatrix.WebData.Test\\WebMatrix.WebData.Test.csproj"
55+
]
56+
}
57+
}

‎Runtime.NetStandard.slnf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"solution": {
3+
"path": "Runtime.sln",
4+
"projects": [
5+
"src\\System.Net.Http.Formatting.ns1_3\\System.Net.Http.Formatting.ns1_3.csproj",
6+
"src\\System.Net.Http.Formatting.ns2_0\\System.Net.Http.Formatting.ns2_0.csproj",
7+
"test\\Microsoft.TestCommon\\Microsoft.TestCommon.csproj",
8+
"test\\System.Net.Http.Formatting.ns1_3.Test\\System.Net.Http.Formatting.ns1_3.Test.csproj",
9+
"test\\System.Net.Http.Formatting.ns2_0.Test\\System.Net.Http.Formatting.ns2_0.Test.csproj"
10+
]
11+
}
12+
}

‎Runtime.msbuild

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
99
<CodeAnalysis Condition=" '$(CodeAnalysis)' == '' and '$(Configuration)' != 'Release' ">true</CodeAnalysis>
1010
<StyleCopEnabled Condition=" '$(StyleCopEnabled)' == '' ">true</StyleCopEnabled>
11-
<BuildPortable Condition=" '$(BuildPortable)' == '' ">true</BuildPortable>
1211
<BuildInParallel Condition=" '$(BuildInParallel)' == '' And $(MSBuildNodeCount) &gt; 1 ">true</BuildInParallel>
1312
<BuildInParallel Condition=" '$(BuildInParallel)' == '' ">false</BuildInParallel>
1413
<RestoreInParallel Condition=" '$(RestoreInParallel)' == '' ">false</RestoreInParallel>
@@ -19,16 +18,6 @@
1918
<NuGetExe>.nuget\NuGet.exe</NuGetExe>
2019
</PropertyGroup>
2120

22-
<ItemGroup>
23-
<SolutionsToBuild Include="Runtime.sln">
24-
<BuildInParallel>$(BuildInParallel)</BuildInParallel>
25-
</SolutionsToBuild>
26-
<SolutionsToBuild Include="RuntimePortable.sln">
27-
<BuildInParallel>$(BuildInParallel)</BuildInParallel>
28-
<Portable>true</Portable>
29-
</SolutionsToBuild>
30-
</ItemGroup>
31-
3221
<Target Name="EnableSkipStrongNames" DependsOnTargets="RestoreSkipStrongNames">
3322
<Exec Command='"$(SkipStrongNamesExe)" -e "$(SkipStrongNamesXml)"' />
3423
<CheckSkipStrongNamesStatus AssembliesFile="$(SkipStrongNamesXml)">
@@ -49,9 +38,8 @@
4938

5039
<Target Name="Clean">
5140
<MSBuild
52-
Projects="@(SolutionsToBuild)"
41+
Projects="Runtime.sln"
5342
Targets="Clean"
54-
Condition=" '%(SolutionsToBuild.Portable)' != 'true' or '$(BuildPortable)' == 'true' "
5543
Properties="Configuration=$(Configuration);VisualStudioVersion=$(VisualStudioVersion)" />
5644
<RemoveDir Directories="bin\$(Configuration)" />
5745
</Target>
@@ -66,10 +54,9 @@
6654

6755
<Target Name="RestorePackages" DependsOnTargets="DownloadNuGet">
6856
<ItemGroup>
69-
<_ToRestore Include="@(SolutionsToBuild)" />
57+
<_ToRestore Include="Runtime.sln" />
7058
<_ToRestore Include="test\Microsoft.TestCommon\Microsoft.TestCommon.csproj"
71-
AdditionalProperties="NetFX_Core=true"
72-
Condition=" '$(BuildPortable)' == 'true' " />
59+
AdditionalProperties="Testing_NetStandard1_3=true" />
7360
</ItemGroup>
7461
<Message Text="%0ARestoring NuGet packages..." Importance="High" />
7562
<MSBuild Projects="@(_ToRestore)" Targets="Restore"
@@ -96,29 +83,27 @@
9683
<Error Condition=" '$(CodeAnalysis)' == 'true' and '$(Configuration)' == 'Release' " Text="Unable to run code analysis in Release configuration. Release assemblies do not include SuppressMessage attributes (so code analysis would always fail with the errors that are normally suppressed)." />
9784
<MakeDir Directories="bin\$(Configuration)" />
9885
<MSBuild
99-
Projects="@(SolutionsToBuild)"
100-
BuildInParallel="%(SolutionsToBuild.BuildInParallel)"
86+
Projects="Runtime.sln"
87+
BuildInParallel="$(BuildInParallel)"
10188
Targets="Build"
102-
Condition=" '%(SolutionsToBuild.Portable)' != 'true' or '$(BuildPortable)' == 'true' "
10389
Properties="Configuration=$(Configuration);CodeAnalysis=$(CodeAnalysis);StyleCopEnabled=$(StyleCopEnabled);VisualStudioVersion=$(VisualStudioVersion)" />
10490
</Target>
10591

10692
<Target Name="UnitTest" DependsOnTargets="Build;PrintTestRunSummary" />
10793

10894
<Target Name="RunTests" DependsOnTargets="CheckSkipStrongNames">
10995
<ItemGroup>
110-
<_TestDLLsXunit Include="bin\$(Configuration)\test\*.Test.dll" />
111-
<_TestDLLsXunit Include="bin\$(Configuration)\test\*\net4*\*.Test.dll"
112-
Condition=" '$(BuildPortable)' == 'true' " />
96+
<_TestDLLsXunit Include="bin\$(Configuration)\test\*.Test.dll;
97+
bin\$(Configuration)\test\*\net4*\*.Test.dll" />
11398
<_XunitProject Include="tools\WebStack.testing.targets">
11499
<Properties>TestAssembly=%(_TestDLLsXunit.FullPath);
115100
XmlPath=$(TestResultsDirectory)%(_TestDLLsXunit.FileName)-XunitResults.xml</Properties>
116101
</_XunitProject>
117102

118-
<_VSTestDLLs Include="bin\$(Configuration)\test\NetCore\**\*.Test.dll;
119-
bin\$(Configuration)\test\NetStandard\**\*.Test.dll"
120-
Exclude="bin\$(Configuration)\test\Net*\net4*\*.Test.dll" />
121-
<_XunitProject Include="tools\WebStack.testing.targets" Condition=" '$(BuildPortable)' == 'true' ">
103+
<_VSTestDLLs Include="bin\$(Configuration)\test\ns1_3\**\*.Test.dll;
104+
bin\$(Configuration)\test\ns2_0\**\*.Test.dll"
105+
Exclude="bin\$(Configuration)\test\*\net4*\*.Test.dll" />
106+
<_XunitProject Include="tools\WebStack.testing.targets">
122107
<Properties>TestAssembly=%(_VSTestDLLs.FullPath);
123108
XmlPath=$(TestResultsDirectory)%(_VSTestDLLs.FileName)-$([System.String]::Copy('%(_VSTestDLLs.RecursiveDir)').Trim('\\'))-XunitResults.xml;
124109
UseVSTest=true</Properties>

‎Runtime.sln

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.Http.Test", "tes
5757
EndProject
5858
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="System.Net.Http.Formatting","src\System.Net.Http.Formatting\System.Net.Http.Formatting.csproj","{668E9021-CE84-49D9-98FB-DF125A9FCDB0}"
5959
EndProject
60-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="Microsoft.TestCommon","test\Microsoft.TestCommon\Microsoft.TestCommon.csproj","{FCCC4CB7-BAF7-4A57-9F89-E5766FE536C0}"
60+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="Microsoft.TestCommon","test\Microsoft.TestCommon\Microsoft.TestCommon.csproj","{FCCC4CB7-BAF7-4A57-9F89-E5766FE536C0}"
6161
EndProject
6262
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="System.Net.Http.Formatting.Test","test\System.Net.Http.Formatting.Test\System.Net.Http.Formatting.Test.csproj","{7AF77741-9158-4D5F-8782-8F21FADF025F}"
6363
EndProject
@@ -95,8 +95,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.Http.Owin", "src
9595
EndProject
9696
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="System.Web.Http.Owin.Test","test\System.Web.Http.Owin.Test\System.Web.Http.Owin.Test.csproj","{C19267DD-3984-430C-AE18-4034F85DE4E5}"
9797
EndProject
98-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") =".nuget",".nuget","{CB34D534-9A09-4EE4-B350-C1C23AFBF5EE}"
98+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Solution items","Solution items","{CB34D534-9A09-4EE4-B350-C1C23AFBF5EE}"
9999
ProjectSection(SolutionItems) =preProject
100+
global.json=global.json
100101
NuGet.Config=NuGet.Config
101102
.nuget\packages.config= .nuget\packages.config
102103
EndProjectSection
@@ -113,6 +114,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Facebook",
113114
EndProject
114115
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="Microsoft.AspNet.Facebook.Test","test\Microsoft.AspNet.Facebook.Test\Microsoft.AspNet.Facebook.Test.csproj","{C3BEF382-C7C4-454D-B017-1EAC03E9A82C}"
115116
EndProject
117+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="System.Net.Http.Formatting.ns1_3","src\System.Net.Http.Formatting.ns1_3\System.Net.Http.Formatting.ns1_3.csproj","{5ABD9968-F3A3-4967-B768-A6142F69759E}"
118+
EndProject
119+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="System.Net.Http.Formatting.ns2_0","src\System.Net.Http.Formatting.ns2_0\System.Net.Http.Formatting.ns2_0.csproj","{9AAFB58C-B8C1-4D7F-80E6-7B95C94A829B}"
120+
EndProject
121+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="System.Net.Http.Formatting.ns1_3.Test","test\System.Net.Http.Formatting.ns1_3.Test\System.Net.Http.Formatting.ns1_3.Test.csproj","{A1A20049-04C2-4676-93CF-92449C4BBAA9}"
122+
EndProject
123+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="System.Net.Http.Formatting.ns2_0.Test","test\System.Net.Http.Formatting.ns2_0.Test\System.Net.Http.Formatting.ns2_0.Test.csproj","{6C320AD9-F380-4F8B-85F9-0689F88766EC}"
124+
EndProject
116125
Global
117126
GlobalSection(SolutionConfigurationPlatforms) =preSolution
118127
CodeAnalysis|Any CPU=CodeAnalysis|Any CPU
@@ -420,6 +429,30 @@ Global
420429
{C3BEF382-C7C4-454D-B017-1EAC03E9A82C}.Debug|Any CPU.Build.0=Debug|Any CPU
421430
{C3BEF382-C7C4-454D-B017-1EAC03E9A82C}.Release|Any CPU.ActiveCfg=Release|Any CPU
422431
{C3BEF382-C7C4-454D-B017-1EAC03E9A82C}.Release|Any CPU.Build.0=Release|Any CPU
432+
{5ABD9968-F3A3-4967-B768-A6142F69759E}.CodeAnalysis|Any CPU.ActiveCfg=CodeAnalysis|Any CPU
433+
{5ABD9968-F3A3-4967-B768-A6142F69759E}.CodeAnalysis|Any CPU.Build.0=CodeAnalysis|Any CPU
434+
{5ABD9968-F3A3-4967-B768-A6142F69759E}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
435+
{5ABD9968-F3A3-4967-B768-A6142F69759E}.Debug|Any CPU.Build.0=Debug|Any CPU
436+
{5ABD9968-F3A3-4967-B768-A6142F69759E}.Release|Any CPU.ActiveCfg=Release|Any CPU
437+
{5ABD9968-F3A3-4967-B768-A6142F69759E}.Release|Any CPU.Build.0=Release|Any CPU
438+
{9AAFB58C-B8C1-4D7F-80E6-7B95C94A829B}.CodeAnalysis|Any CPU.ActiveCfg=CodeAnalysis|Any CPU
439+
{9AAFB58C-B8C1-4D7F-80E6-7B95C94A829B}.CodeAnalysis|Any CPU.Build.0=CodeAnalysis|Any CPU
440+
{9AAFB58C-B8C1-4D7F-80E6-7B95C94A829B}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
441+
{9AAFB58C-B8C1-4D7F-80E6-7B95C94A829B}.Debug|Any CPU.Build.0=Debug|Any CPU
442+
{9AAFB58C-B8C1-4D7F-80E6-7B95C94A829B}.Release|Any CPU.ActiveCfg=Release|Any CPU
443+
{9AAFB58C-B8C1-4D7F-80E6-7B95C94A829B}.Release|Any CPU.Build.0=Release|Any CPU
444+
{A1A20049-04C2-4676-93CF-92449C4BBAA9}.CodeAnalysis|Any CPU.ActiveCfg=CodeAnalysis|Any CPU
445+
{A1A20049-04C2-4676-93CF-92449C4BBAA9}.CodeAnalysis|Any CPU.Build.0=CodeAnalysis|Any CPU
446+
{A1A20049-04C2-4676-93CF-92449C4BBAA9}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
447+
{A1A20049-04C2-4676-93CF-92449C4BBAA9}.Debug|Any CPU.Build.0=Debug|Any CPU
448+
{A1A20049-04C2-4676-93CF-92449C4BBAA9}.Release|Any CPU.ActiveCfg=Release|Any CPU
449+
{A1A20049-04C2-4676-93CF-92449C4BBAA9}.Release|Any CPU.Build.0=Release|Any CPU
450+
{6C320AD9-F380-4F8B-85F9-0689F88766EC}.CodeAnalysis|Any CPU.ActiveCfg=CodeAnalysis|Any CPU
451+
{6C320AD9-F380-4F8B-85F9-0689F88766EC}.CodeAnalysis|Any CPU.Build.0=CodeAnalysis|Any CPU
452+
{6C320AD9-F380-4F8B-85F9-0689F88766EC}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
453+
{6C320AD9-F380-4F8B-85F9-0689F88766EC}.Debug|Any CPU.Build.0=Debug|Any CPU
454+
{6C320AD9-F380-4F8B-85F9-0689F88766EC}.Release|Any CPU.ActiveCfg=Release|Any CPU
455+
{6C320AD9-F380-4F8B-85F9-0689F88766EC}.Release|Any CPU.Build.0=Release|Any CPU
423456
EndGlobalSection
424457
GlobalSection(SolutionProperties) =preSolution
425458
HideSolutionNode =FALSE
@@ -475,6 +508,10 @@ Global
475508
{1E89A3E9-0A7F-418F-B4BE-6E38A6315373} ={C40883CD-366D-4534-8B58-3EA0D13136DF}
476509
{821A136C-7C6F-44C6-A9E6-C39B5BFB1483} ={A9836F9E-6DB3-4D9F-ADCA-CF42D8C8BA93}
477510
{C3BEF382-C7C4-454D-B017-1EAC03E9A82C} ={C40883CD-366D-4534-8B58-3EA0D13136DF}
511+
{5ABD9968-F3A3-4967-B768-A6142F69759E} ={A9836F9E-6DB3-4D9F-ADCA-CF42D8C8BA93}
512+
{9AAFB58C-B8C1-4D7F-80E6-7B95C94A829B} ={A9836F9E-6DB3-4D9F-ADCA-CF42D8C8BA93}
513+
{A1A20049-04C2-4676-93CF-92449C4BBAA9} ={C40883CD-366D-4534-8B58-3EA0D13136DF}
514+
{6C320AD9-F380-4F8B-85F9-0689F88766EC} ={C40883CD-366D-4534-8B58-3EA0D13136DF}
478515
EndGlobalSection
479516
GlobalSection(ExtensibilityGlobals) =postSolution
480517
SolutionGuid ={A855CFDC-9BEE-43A9-A3EA-4C4624A747DB}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp