Skip to content
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

refactor: Restructure repo #98

Merged
merged 10 commits into from
May 15, 2024
+17 −19
Merged

refactor: Restructure repo #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
48ef823
Move MimeMapping project to src\MimeMapping
gintsk Feb 18, 2024
c21ba52
Use artifacts output
gintsk Feb 18, 2024
47e602b
PR comments
gintsk Mar 3, 2024
7e0dcf7
fix project reference
gintsk Mar 3, 2024
0295314
Rename folder from Test to test
gintsk Mar 3, 2024
0b28e92
Rename Test project to MimeMapping.Tests
gintsk Mar 4, 2024
9704b4e
Move strong signing to directory.build.props
gintsk Mar 4, 2024
f5daff6
move `test.runsettings` one level up
gintsk Mar 4, 2024
2dd0c95
ci: fix release
viceice May 15, 2024
2d3255f
ci: fix release
viceice May 15, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ jobs:
run: dotnet restore

- name: build
run: dotnet build --no-restore
run: dotnet build -c release --no-restore

- name: pack
run: dotnet pack -o bin
run: dotnet pack -o bin --no-build

- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
with:
Expand Down
10 changes: 10 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Project>
<PropertyGroup>
<UseArtifactsOutput>true</UseArtifactsOutput>
</PropertyGroup>

<PropertyGroup Label="Assembly Signing">
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)MimeMapping.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions MimeMapping.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
README.md = README.md
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{063EE5BF-8922-4280-8DFC-1226E9298F35}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MimeMapping.Tests", "test\MimeMapping.Tests\MimeMapping.Tests.csproj", "{063EE5BF-8922-4280-8DFC-1226E9298F35}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MimeMapping", "MimeMapping.csproj", "{42893F4D-DE5F-4132-A408-E90BFF840342}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MimeMapping", "src\MimeMapping\MimeMapping.csproj", "{42893F4D-DE5F-4132-A408-E90BFF840342}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
0 KnownMimeTypes.cs → src/MimeMapping/KnownMimeTypes.cs
View file
Open in desktop
File renamed without changes.
0 KnownMimeTypes.tt → src/MimeMapping/KnownMimeTypes.tt
View file
Open in desktop
File renamed without changes.
14 changes: 1 addition & 13 deletions MimeMapping.csproj → src/MimeMapping/MimeMapping.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ https://learn.microsoft.com/dotnet/api/system.web.mimemapping.getmimemapping
<Authors>Matthew Little</Authors>
<Company />
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>MimeMapping.snk</AssemblyOriginatorKeyFile>

<!-- https://github.com/dotnet/sourcelink -->
<PublishRepositoryUrl>true</PublishRepositoryUrl>
Expand All @@ -41,17 +39,7 @@ https://learn.microsoft.com/dotnet/api/system.web.mimemapping.getmimemapping
</PropertyGroup>

<ItemGroup>
<Compile Remove="Test\**" />
<EmbeddedResource Remove="Test\**" />
<None Remove="Test\**" />
</ItemGroup>

<ItemGroup>
<None Remove=".editorconfig" />
<None Remove=".gitignore" />
<None Remove="LICENSE.md" />
<None Remove="**/TestResults/**" />
<None Include="README.md" Pack="true" PackagePath="\" />
<None Include="../../README.md" Pack="true" PackagePath="\" />
</ItemGroup>

<ItemGroup>
Expand Down
0 MimeUtility.cs → src/MimeMapping/MimeUtility.cs
View file
Open in desktop
File renamed without changes.
0 Test/BasicTest.cs → test/MimeMapping.Tests/BasicTest.cs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions Test/Test.csproj → ...imeMapping.Tests/MimeMapping.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFrameworks>net8.0;net6.0;net48</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSUnixLike())">net8.0;net6.0</TargetFrameworks>
<RunSettingsFilePath>$(MSBuildThisFileDirectory)/test.runsettings</RunSettingsFilePath>
<RunSettingsFilePath>$(MSBuildThisFileDirectory)..\test.runsettings</RunSettingsFilePath>
<LangVersion>latest</LangVersion>
</PropertyGroup>

Expand All @@ -15,6 +15,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\MimeMapping.csproj" />
<ProjectReference Include="..\..\src\MimeMapping\MimeMapping.csproj" />
</ItemGroup>
</Project>
0 Test/Properties/AssemblyInfo.cs → ...eMapping.Tests/Properties/AssemblyInfo.cs
View file
Open in desktop
File renamed without changes.
0 Test/TemplateSourceTests.cs → .../MimeMapping.Tests/TemplateSourceTests.cs
View file
Open in desktop
File renamed without changes.
0 Test/test.runsettings → test/test.runsettings
View file
Open in desktop
File renamed without changes.
Loading