Skip to content

Move configuration to Sdk. #2

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

Open
NPK111 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Move configuration to Sdk. #2

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
22 changes: 22 additions & 0 deletions OneWare.Plugin.Sdk/OneWare.Plugin.Sdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<PackageId>OneWare.Plugin.Sdk</PackageId>
<Version Condition="'$(Version)' == ''">1.0.0</Version>
<Authors>OneWare</Authors>
<Description>MSBuild debug launch integration for OneWare plugin development.</Description>
<PackageProjectUrl>https://github.com/one-ware/OneWare.Templates</PackageProjectUrl>
<RepositoryUrl>https://github.com/one-ware/OneWare.Templates.git</RepositoryUrl>
<PackageTags>oneware;plugin;sdk;msbuild</PackageTags>
<PackageType>Dependency</PackageType>
<IncludeBuildOutput>false</IncludeBuildOutput>
<NoBuild>true</NoBuild>
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
</PropertyGroup>

<ItemGroup>
<None Include="build\**\*" Pack="true" PackagePath="build\" />
</ItemGroup>

</Project>
19 changes: 19 additions & 0 deletions OneWare.Plugin.Sdk/build/OneWare.Plugin.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<Project>

<PropertyGroup Condition="'$(Configuration)' == 'Debug' and '$(TargetPath)' != ''">
<OneWareCommand Condition="'$(OneWareCommand)' == '' and '$(ONEWARE_RUN_COMMAND)' != ''">$(ONEWARE_RUN_COMMAND)</OneWareCommand>
<OneWareCommand Condition="'$(OneWareCommand)' == ''">oneware</OneWareCommand>
<OneWarePluginDebugPath>$([System.IO.Path]::GetDirectoryName('$(TargetPath)'))</OneWarePluginDebugPath>
<OneWareRunArguments>--modules &quot;$(OneWarePluginDebugPath)&quot;</OneWareRunArguments>
<StartAction Condition="'$(StartAction)' == ''">Program</StartAction>
<StartProgram Condition="'$(StartProgram)' == '' and '$(OS)' == 'Windows_NT'">$([System.Environment]::GetEnvironmentVariable('ComSpec'))</StartProgram>
<StartProgram Condition="'$(StartProgram)' == '' and '$(OS)' != 'Windows_NT'">/bin/sh</StartProgram>
<StartArguments Condition="'$(StartArguments)' == '' and '$(OS)' == 'Windows_NT'">/c &quot;&quot;$(OneWareCommand)&quot; $(OneWareRunArguments)&quot;</StartArguments>
<StartArguments Condition="'$(StartArguments)' == '' and '$(OS)' != 'Windows_NT'">-lc '&quot;$(OneWareCommand)&quot; $(OneWareRunArguments)'</StartArguments>
<StartWorkingDirectory Condition="'$(StartWorkingDirectory)' == ''">$(OneWarePluginDebugPath)</StartWorkingDirectory>
<RunCommand Condition="'$(RunCommand)' == ''">$(OneWareCommand)</RunCommand>
<RunArguments Condition="'$(RunArguments)' == ''">$(OneWareRunArguments)</RunArguments>
<RunWorkingDirectory Condition="'$(RunWorkingDirectory)' == ''">$(OneWarePluginDebugPath)</RunWorkingDirectory>
</PropertyGroup>

</Project>
11 changes: 11 additions & 0 deletions OneWare.Templates.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<PackageType>Template</PackageType>
<PackageVersion>1.0.0</PackageVersion>
<PackageId>OneWare.Templates</PackageId>
<PluginSdkPackageVersion>1.0.0</PluginSdkPackageVersion>
<Title>OneWare Templates</Title>
<Description>Templates for creating OneWare extensions and libraries.</Description>
<PackageTags>dotnet-new;templates;oneware</PackageTags>
Expand All @@ -27,4 +28,14 @@
<None Include="package-icon.png" Pack="true" PackagePath="/" />
</ItemGroup>

<ItemGroup>
<AdditionalPackProjects Include="OneWare.Plugin.Sdk\OneWare.Plugin.Sdk.csproj" />
</ItemGroup>

<Target Name="PackAdditionalProjects" AfterTargets="Pack">
<MSBuild Projects="@(AdditionalPackProjects)"
Targets="Restore;Pack"
Properties="Configuration=$(Configuration);PackageOutputPath=$(PackageOutputPath);Version=$(PluginSdkPackageVersion)" />
</Target>

</Project>
6 changes: 4 additions & 2 deletions install-dev-templates.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
dotnet new uninstall OneWare.Templates
Remove-Item bin/**/*.nupkg
$result = dotnet pack | select-string "Successfully created package '(.*)'" -AllMatches
$package = $result.Matches.Groups[1]
$null = dotnet pack
$package = Get-ChildItem .\bin -Filter 'OneWare.Templates*.nupkg' -Recurse |
Sort-Object LastWriteTime -Descending |
Select-Object -First 1 -ExpandProperty FullName
dotnet new install $package
5 changes: 3 additions & 2 deletions install-dev-templates.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ dotnet new uninstall OneWare.Templates
# Remove .nupkg files from bin directory and its subdirectories
rm bin/**/*.nupkg

# Pack and capture the output to find the package name
result=$(dotnet pack | grep -oP "Successfully created package '\K(.*)(?=')")
# Pack and pick the template package from the output directory
dotnet pack > /dev/null
result=$(find bin -name 'OneWare.Templates*.nupkg' -print | sort | tail -n 1)

# Install the package
dotnet new install "$result"
7 changes: 4 additions & 3 deletions ...tes/OneWareExtensionTemplate/src/OneWareExtensionTemplate/OneWareExtensionTemplate.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@

<ItemGroup>
<PackageReference Include="OneWare.Essentials" Version="1.0.0" Private="false" ExcludeAssets="runtime;Native" />
<PackageReference Include="OneWare.Plugin.Sdk" Version="1.0.0" PrivateAssets="all" />
</ItemGroup>

<Target Name="GenerateCompatibilityFile" AfterTargets="Build">
<ItemGroup>
<!--/-:msbuild-conditional:noEmit -->
<FilteredDependencies Include="@(PackageReference)" Condition="'%(Private)' == 'false'"/>
<!--/+:msbuild-conditional:noEmit -->
<!--/-:msbuild-conditional:noEmit -->
<FilteredDependencies Include="@(PackageReference)" Condition="'%(PackageReference.Private)' == 'false'"/>
<!--/+:msbuild-conditional:noEmit -->
</ItemGroup>

<WriteLinesToFile
Expand Down