Skip to content

Rename Formatting projects and more #392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 28, 2023
Merged

Rename Formatting projects and more #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e51e8a
Rename `netstandard` Formatting projects
dougbu Feb 24, 2023
e65b647
Adjust `netstandard` Formatting output paths
dougbu Feb 24, 2023
be409a8
Use `NETSTANDARD1_3` and `Testing_NetStandard1_3`
dougbu Feb 24, 2023
89412eb
Remove RuntimePortable.sln
dougbu Feb 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- script: .\build.cmd EnableSkipStrongNames
displayName: Windows Build - EnableSkipStrongNames

- script: .\build.cmd Build /p:BuildPortable=true
- script: .\build.cmd Build
displayName: Windows Build

- task: CodeQL3000Finalize@0
Expand Down
57 changes: 57 additions & 0 deletions Runtime.NetFramework.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"solution": {
"path": "Runtime.sln",
"projects": [
"src\\Microsoft.AspNet.Facebook\\Microsoft.AspNet.Facebook.csproj",
"src\\Microsoft.Web.Helpers\\Microsoft.Web.Helpers.csproj",
"src\\Microsoft.Web.Mvc\\Microsoft.Web.Mvc.csproj",
"src\\Microsoft.Web.WebPages.OAuth\\Microsoft.Web.WebPages.OAuth.csproj",
"src\\System.Net.Http.Formatting\\System.Net.Http.Formatting.csproj",
"src\\System.Web.Cors\\System.Web.Cors.csproj",
"src\\System.Web.Helpers\\System.Web.Helpers.csproj",
"src\\System.Web.Http.Cors\\System.Web.Http.Cors.csproj",
"src\\System.Web.Http.Owin\\System.Web.Http.Owin.csproj",
"src\\System.Web.Http.SelfHost\\System.Web.Http.SelfHost.csproj",
"src\\System.Web.Http.SignalR\\System.Web.Http.SignalR.csproj",
"src\\System.Web.Http.Tracing\\System.Web.Http.Tracing.csproj",
"src\\System.Web.Http.WebHost\\System.Web.Http.WebHost.csproj",
"src\\System.Web.Http\\System.Web.Http.csproj",
"src\\System.Web.Mvc\\System.Web.Mvc.csproj",
"src\\System.Web.Razor\\System.Web.Razor.csproj",
"src\\System.Web.WebPages.Administration\\System.Web.WebPages.Administration.csproj",
"src\\System.Web.WebPages.Deployment\\System.Web.WebPages.Deployment.csproj",
"src\\System.Web.WebPages.Razor\\System.Web.WebPages.Razor.csproj",
"src\\System.Web.WebPages\\System.Web.WebPages.csproj",
"src\\WebApiHelpPage\\VB\\WebApiHelpPageVB.vbproj",
"src\\WebApiHelpPage\\WebApiHelpPage.csproj",
"src\\WebMatrix.Data\\WebMatrix.Data.csproj",
"src\\WebMatrix.WebData\\WebMatrix.WebData.csproj",
"test\\Microsoft.AspNet.Facebook.Test\\Microsoft.AspNet.Facebook.Test.csproj",
"test\\Microsoft.TestCommon\\Microsoft.TestCommon.csproj",
"test\\Microsoft.Web.Helpers.Test\\Microsoft.Web.Helpers.Test.csproj",
"test\\Microsoft.Web.Mvc.Test\\Microsoft.Web.Mvc.Test.csproj",
"test\\Microsoft.Web.WebPages.OAuth.Test\\Microsoft.Web.WebPages.OAuth.Test.csproj",
"test\\System.Net.Http.Formatting.Test\\System.Net.Http.Formatting.Test.csproj",
"test\\System.Web.Cors.Test\\System.Web.Cors.Test.csproj",
"test\\System.Web.Helpers.Test\\System.Web.Helpers.Test.csproj",
"test\\System.Web.Http.Cors.Test\\System.Web.Http.Cors.Test.csproj",
"test\\System.Web.Http.Integration.Test\\System.Web.Http.Integration.Test.csproj",
"test\\System.Web.Http.Owin.Test\\System.Web.Http.Owin.Test.csproj",
"test\\System.Web.Http.SelfHost.Test\\System.Web.Http.SelfHost.Test.csproj",
"test\\System.Web.Http.SignalR.Test\\System.Web.Http.SignalR.Test.csproj",
"test\\System.Web.Http.Test\\System.Web.Http.Test.csproj",
"test\\System.Web.Http.Tracing.Test\\System.Web.Http.Tracing.Test.csproj",
"test\\System.Web.Http.WebHost.Test\\System.Web.Http.WebHost.Test.csproj",
"test\\System.Web.Mvc.Test\\System.Web.Mvc.Test.csproj",
"test\\System.Web.Razor.Test\\System.Web.Razor.Test.csproj",
"test\\System.Web.WebPages.Administration.Test\\System.Web.WebPages.Administration.Test.csproj",
"test\\System.Web.WebPages.Deployment.Test\\System.Web.WebPages.Deployment.Test.csproj",
"test\\System.Web.WebPages.Razor.Test\\System.Web.WebPages.Razor.Test.csproj",
"test\\System.Web.WebPages.Test\\System.Web.WebPages.Test.csproj",
"test\\WebApiHelpPage.Test\\WebApiHelpPage.Test.csproj",
"test\\WebApiHelpPage.VB.Test\\WebApiHelpPage.VB.Test.csproj",
"test\\WebMatrix.Data.Test\\WebMatrix.Data.Test.csproj",
"test\\WebMatrix.WebData.Test\\WebMatrix.WebData.Test.csproj"
]
}
}
12 changes: 12 additions & 0 deletions Runtime.NetStandard.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"solution": {
"path": "Runtime.sln",
"projects": [
"src\\System.Net.Http.Formatting.ns1_3\\System.Net.Http.Formatting.ns1_3.csproj",
"src\\System.Net.Http.Formatting.ns2_0\\System.Net.Http.Formatting.ns2_0.csproj",
"test\\Microsoft.TestCommon\\Microsoft.TestCommon.csproj",
"test\\System.Net.Http.Formatting.ns1_3.Test\\System.Net.Http.Formatting.ns1_3.Test.csproj",
"test\\System.Net.Http.Formatting.ns2_0.Test\\System.Net.Http.Formatting.ns2_0.Test.csproj"
]
}
}
37 changes: 11 additions & 26 deletions Runtime.msbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<CodeAnalysis Condition=" '$(CodeAnalysis)' == '' and '$(Configuration)' != 'Release' ">true</CodeAnalysis>
<StyleCopEnabled Condition=" '$(StyleCopEnabled)' == '' ">true</StyleCopEnabled>
<BuildPortable Condition=" '$(BuildPortable)' == '' ">true</BuildPortable>
<BuildInParallel Condition=" '$(BuildInParallel)' == '' And $(MSBuildNodeCount) &gt; 1 ">true</BuildInParallel>
<BuildInParallel Condition=" '$(BuildInParallel)' == '' ">false</BuildInParallel>
<RestoreInParallel Condition=" '$(RestoreInParallel)' == '' ">false</RestoreInParallel>
Expand All @@ -19,16 +18,6 @@
<NuGetExe>.nuget\NuGet.exe</NuGetExe>
</PropertyGroup>

<ItemGroup>
<SolutionsToBuild Include="Runtime.sln">
<BuildInParallel>$(BuildInParallel)</BuildInParallel>
</SolutionsToBuild>
<SolutionsToBuild Include="RuntimePortable.sln">
<BuildInParallel>$(BuildInParallel)</BuildInParallel>
<Portable>true</Portable>
</SolutionsToBuild>
</ItemGroup>

<Target Name="EnableSkipStrongNames" DependsOnTargets="RestoreSkipStrongNames">
<Exec Command='"$(SkipStrongNamesExe)" -e "$(SkipStrongNamesXml)"' />
<CheckSkipStrongNamesStatus AssembliesFile="$(SkipStrongNamesXml)">
Expand All @@ -49,9 +38,8 @@

<Target Name="Clean">
<MSBuild
Projects="@(SolutionsToBuild)"
Projects="Runtime.sln"
Targets="Clean"
Condition=" '%(SolutionsToBuild.Portable)' != 'true' or '$(BuildPortable)' == 'true' "
Properties="Configuration=$(Configuration);VisualStudioVersion=$(VisualStudioVersion)" />
<RemoveDir Directories="bin\$(Configuration)" />
</Target>
Expand All @@ -66,10 +54,9 @@

<Target Name="RestorePackages" DependsOnTargets="DownloadNuGet">
<ItemGroup>
<_ToRestore Include="@(SolutionsToBuild)" />
<_ToRestore Include="Runtime.sln" />
<_ToRestore Include="test\Microsoft.TestCommon\Microsoft.TestCommon.csproj"
AdditionalProperties="NetFX_Core=true"
Condition=" '$(BuildPortable)' == 'true' " />
AdditionalProperties="Testing_NetStandard1_3=true" />
</ItemGroup>
<Message Text="%0ARestoring NuGet packages..." Importance="High" />
<MSBuild Projects="@(_ToRestore)" Targets="Restore"
Expand All @@ -96,29 +83,27 @@
<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)." />
<MakeDir Directories="bin\$(Configuration)" />
<MSBuild
Projects="@(SolutionsToBuild)"
BuildInParallel="%(SolutionsToBuild.BuildInParallel)"
Projects="Runtime.sln"
BuildInParallel="$(BuildInParallel)"
Targets="Build"
Condition=" '%(SolutionsToBuild.Portable)' != 'true' or '$(BuildPortable)' == 'true' "
Properties="Configuration=$(Configuration);CodeAnalysis=$(CodeAnalysis);StyleCopEnabled=$(StyleCopEnabled);VisualStudioVersion=$(VisualStudioVersion)" />
</Target>

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

<Target Name="RunTests" DependsOnTargets="CheckSkipStrongNames">
<ItemGroup>
<_TestDLLsXunit Include="bin\$(Configuration)\test\*.Test.dll" />
<_TestDLLsXunit Include="bin\$(Configuration)\test\*\net4*\*.Test.dll"
Condition=" '$(BuildPortable)' == 'true' " />
<_TestDLLsXunit Include="bin\$(Configuration)\test\*.Test.dll;
bin\$(Configuration)\test\*\net4*\*.Test.dll" />
<_XunitProject Include="tools\WebStack.testing.targets">
<Properties>TestAssembly=%(_TestDLLsXunit.FullPath);
XmlPath=$(TestResultsDirectory)%(_TestDLLsXunit.FileName)-XunitResults.xml</Properties>
</_XunitProject>

<_VSTestDLLs Include="bin\$(Configuration)\test\NetCore\**\*.Test.dll;
bin\$(Configuration)\test\NetStandard\**\*.Test.dll"
Exclude="bin\$(Configuration)\test\Net*\net4*\*.Test.dll" />
<_XunitProject Include="tools\WebStack.testing.targets" Condition=" '$(BuildPortable)' == 'true' ">
<_VSTestDLLs Include="bin\$(Configuration)\test\ns1_3\**\*.Test.dll;
bin\$(Configuration)\test\ns2_0\**\*.Test.dll"
Exclude="bin\$(Configuration)\test\*\net4*\*.Test.dll" />
<_XunitProject Include="tools\WebStack.testing.targets">
<Properties>TestAssembly=%(_VSTestDLLs.FullPath);
XmlPath=$(TestResultsDirectory)%(_VSTestDLLs.FileName)-$([System.String]::Copy('%(_VSTestDLLs.RecursiveDir)').Trim('\\'))-XunitResults.xml;
UseVSTest=true</Properties>
Expand Down
41 changes: 39 additions & 2 deletions Runtime.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.Http.Test", "tes
EndProject
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}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestCommon", "test\Microsoft.TestCommon\Microsoft.TestCommon.csproj", "{FCCC4CB7-BAF7-4A57-9F89-E5766FE536C0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestCommon", "test\Microsoft.TestCommon\Microsoft.TestCommon.csproj", "{FCCC4CB7-BAF7-4A57-9F89-E5766FE536C0}"
EndProject
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}"
EndProject
Expand Down Expand Up @@ -95,8 +95,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.Http.Owin", "src
EndProject
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}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CB34D534-9A09-4EE4-B350-C1C23AFBF5EE}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution items", "{CB34D534-9A09-4EE4-B350-C1C23AFBF5EE}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
NuGet.Config = NuGet.Config
.nuget\packages.config = .nuget\packages.config
EndProjectSection
Expand All @@ -113,6 +114,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Facebook",
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CodeAnalysis|Any CPU = CodeAnalysis|Any CPU
Expand Down Expand Up @@ -420,6 +429,30 @@ Global
{C3BEF382-C7C4-454D-B017-1EAC03E9A82C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C3BEF382-C7C4-454D-B017-1EAC03E9A82C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C3BEF382-C7C4-454D-B017-1EAC03E9A82C}.Release|Any CPU.Build.0 = Release|Any CPU
{5ABD9968-F3A3-4967-B768-A6142F69759E}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU
{5ABD9968-F3A3-4967-B768-A6142F69759E}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU
{5ABD9968-F3A3-4967-B768-A6142F69759E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5ABD9968-F3A3-4967-B768-A6142F69759E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5ABD9968-F3A3-4967-B768-A6142F69759E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5ABD9968-F3A3-4967-B768-A6142F69759E}.Release|Any CPU.Build.0 = Release|Any CPU
{9AAFB58C-B8C1-4D7F-80E6-7B95C94A829B}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU
{9AAFB58C-B8C1-4D7F-80E6-7B95C94A829B}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU
{9AAFB58C-B8C1-4D7F-80E6-7B95C94A829B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9AAFB58C-B8C1-4D7F-80E6-7B95C94A829B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9AAFB58C-B8C1-4D7F-80E6-7B95C94A829B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9AAFB58C-B8C1-4D7F-80E6-7B95C94A829B}.Release|Any CPU.Build.0 = Release|Any CPU
{A1A20049-04C2-4676-93CF-92449C4BBAA9}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU
{A1A20049-04C2-4676-93CF-92449C4BBAA9}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU
{A1A20049-04C2-4676-93CF-92449C4BBAA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A1A20049-04C2-4676-93CF-92449C4BBAA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A1A20049-04C2-4676-93CF-92449C4BBAA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A1A20049-04C2-4676-93CF-92449C4BBAA9}.Release|Any CPU.Build.0 = Release|Any CPU
{6C320AD9-F380-4F8B-85F9-0689F88766EC}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU
{6C320AD9-F380-4F8B-85F9-0689F88766EC}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU
{6C320AD9-F380-4F8B-85F9-0689F88766EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6C320AD9-F380-4F8B-85F9-0689F88766EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C320AD9-F380-4F8B-85F9-0689F88766EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C320AD9-F380-4F8B-85F9-0689F88766EC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -475,6 +508,10 @@ Global
{1E89A3E9-0A7F-418F-B4BE-6E38A6315373} = {C40883CD-366D-4534-8B58-3EA0D13136DF}
{821A136C-7C6F-44C6-A9E6-C39B5BFB1483} = {A9836F9E-6DB3-4D9F-ADCA-CF42D8C8BA93}
{C3BEF382-C7C4-454D-B017-1EAC03E9A82C} = {C40883CD-366D-4534-8B58-3EA0D13136DF}
{5ABD9968-F3A3-4967-B768-A6142F69759E} = {A9836F9E-6DB3-4D9F-ADCA-CF42D8C8BA93}
{9AAFB58C-B8C1-4D7F-80E6-7B95C94A829B} = {A9836F9E-6DB3-4D9F-ADCA-CF42D8C8BA93}
{A1A20049-04C2-4676-93CF-92449C4BBAA9} = {C40883CD-366D-4534-8B58-3EA0D13136DF}
{6C320AD9-F380-4F8B-85F9-0689F88766EC} = {C40883CD-366D-4534-8B58-3EA0D13136DF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A855CFDC-9BEE-43A9-A3EA-4C4624A747DB}
Expand Down
Loading