Skip to content

Ensure dotnet build works too #141

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
kzu merged 1 commit into from
Aug 31, 2025
Merged

Ensure dotnet build works too #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/Demo/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"msbuild-sdks": {
"SmallSharp": "42.42.516-main"
"SmallSharp": "2.0.0"
}
}
5 changes: 5 additions & 0 deletions src/SmallSharp/Sdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

<Import Project="..\build\SmallSharp.props" />

<PropertyGroup>
<ImportProjectExtensionProps>true</ImportProjectExtensionProps>
<ImportProjectExtensionTargets>true</ImportProjectExtensionTargets>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="JsonPoke" Version="1.2.0" PrivateAssets="all" />
</ItemGroup>
Expand Down
8 changes: 8 additions & 0 deletions src/SmallSharp/SmallSharp.Before.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project>

<PropertyGroup>
<_ImportProjectExtensionProps>$(ImportProjectExtensionProps)</_ImportProjectExtensionProps>
<_ImportProjectExtensionTargets>$(ImportProjectExtensionTargets)</_ImportProjectExtensionTargets>
</PropertyGroup>

</Project>
3 changes: 2 additions & 1 deletion src/SmallSharp/SmallSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@
<ItemGroup>
<None Include="..\_._" PackFolder="lib\netstandard2.0" Visible="false" />
<None Update="SmallSharp.targets" PackFolder="$(PackFolder)" CopyToOutputDirectory="PreserveNewest" />
<None Update="SmallSharp.Before.targets" PackFolder="$(PackFolder)" CopyToOutputDirectory="PreserveNewest" />
<None Update="Sdk.props;Sdk.targets" PackFolder="Sdk" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<ItemGroup>
<UpToDateCheckInput Include="SmallSharp.targets;Sdk.props;Sdk.targets" />
<UpToDateCheckInput Include="SmallSharp.targets;SmallSharp.Before.targets;Sdk.props;Sdk.targets" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions src/SmallSharp/SmallSharp.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project>

<PropertyGroup>
<!-- We emit Directory.Packages.props for #:package references -->
<!--<CentralPackageFloatingVersionsEnabled>true</CentralPackageFloatingVersionsEnabled>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>-->
<!-- This disables compilation error in VS for #: prefix -->
<Features Condition="'$(MSBuildIsRestoring)' != 'true'">$(Features);FileBasedProgram</Features>
</PropertyGroup>

<!-- Capture project-level properties before they are defaulted by Microsoft.Common.targets -->
<CustomBeforeMicrosoftCSharpTargets>$(MSBuildThisFileDirectory)\SmallSharp.Before.props</CustomBeforeMicrosoftCSharpTargets>
</PropertyGroup>

</Project>
13 changes: 8 additions & 5 deletions src/SmallSharp/SmallSharp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
</UserProjectNamespace>
<StartupFile>$(ActiveDebugProfile)</StartupFile>
<StartupFile Condition="'$(ActiveDebugProfile)' == '' or !Exists('$(ActiveDebugProfile)')">$(ActiveCompile)</StartupFile>
<StartupFileDependsOn>CollectStartupFile;SelectStartupFile;SelectTopLevelCompile;UpdateLaunchSettings;EmitTargets</StartupFileDependsOn>

<SmallSharpPackagesTargets>$(MSBuildProjectDirectory)\$(BaseIntermediateOutputPath)SmallSharp.targets</SmallSharpPackagesTargets>
<StartupFileDependsOn>EnsureImportProjectExtensions;CollectStartupFile;SelectStartupFile;SelectTopLevelCompile;UpdateLaunchSettings;EmitTargets</StartupFileDependsOn>

<!-- For CLI dotnet run, users should set ImportProjectExtensionTargets=true -->
<SmallSharpPackagesTargets>$(MSBuildProjectExtensionsPath)$(MSBuildProjectFile).smallsharp.targets</SmallSharpPackagesTargets>
</PropertyGroup>

<ItemGroup>
Expand All @@ -30,6 +31,10 @@

<Target Name="StartupFile" BeforeTargets="BeforeCompile;CoreCompile;CompileDesignTime;CollectUpToDateCheckInputDesignTime" DependsOnTargets="$(StartupFileDependsOn)" />

<Target Name="EnsureImportProjectExtensions" Condition="'$(_ImportProjectExtensionProps)' != 'true' or '$(_ImportProjectExtensionTargets)' != 'true'">
<Error Code="SCS01" Text="Setting ImportProjectExtensionProps and ImportProjectExtensionTargets project properties to 'true' is required by SmallSharp to support C# package and project directives." />
</Target>

<Target Name="CollectStartupFile">
<ItemGroup>
<StartupFile Include="*$(DefaultLanguageSourceExtension)" />
Expand Down Expand Up @@ -162,8 +167,6 @@
</EmitTargets>
</Target>

<Import Project="$(SmallSharpPackagesTargets)" Condition="Exists('$(SmallSharpPackagesTargets)')" />

<UsingTask TaskName="SortItems" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
<ParameterGroup>
<!-- ITaskItem[] input and sorted output -->
Expand Down