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

Moved UI files (dojo) to separate project #8

Merged
merged 1 commit into from
Nov 9, 2023
Merged

Moved UI files (dojo) to separate project #8

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
6 changes: 6 additions & 0 deletions Geta.OEmbed.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geta.VideoTools.Mp4", "src\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geta.VideoTools.WebM", "src\Geta.VideoTools.WebM\Geta.VideoTools.WebM.csproj", "{7C293407-095E-4696-A394-DBF5C8ACD710}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Geta.OEmbed.Optimizely.UI", "src\Geta.OEmbed.Optimizely.UI\Geta.OEmbed.Optimizely.UI.csproj", "{55E639C5-6ECD-46AA-BDAF-2D5E5442BCEF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -108,6 +110,10 @@ Global
{7C293407-095E-4696-A394-DBF5C8ACD710}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7C293407-095E-4696-A394-DBF5C8ACD710}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7C293407-095E-4696-A394-DBF5C8ACD710}.Release|Any CPU.Build.0 = Release|Any CPU
{55E639C5-6ECD-46AA-BDAF-2D5E5442BCEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{55E639C5-6ECD-46AA-BDAF-2D5E5442BCEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{55E639C5-6ECD-46AA-BDAF-2D5E5442BCEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{55E639C5-6ECD-46AA-BDAF-2D5E5442BCEF}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
0 ...zely/ClientResources/CheckBoxWithLabel.js → ...y.UI/ClientResources/CheckBoxWithLabel.js
View file
Open in desktop
File renamed without changes.
0 ...ptimizely/ClientResources/OEmbedEditor.js → ...mizely.UI/ClientResources/OEmbedEditor.js
View file
Open in desktop
File renamed without changes.
0 ...ly/ClientResources/styles/geta-oembed.css → ...UI/ClientResources/styles/geta-oembed.css
View file
Open in desktop
File renamed without changes.
0 ...esources/templates/CheckBoxWithLabel.html → ...esources/templates/CheckBoxWithLabel.html
View file
Open in desktop
File renamed without changes.
0 ...ientResources/templates/OEmbedEditor.html → ...ientResources/templates/OEmbedEditor.html
View file
Open in desktop
File renamed without changes.
32 changes: 32 additions & 0 deletions src/Geta.OEmbed.Optimizely.UI/Geta.OEmbed.Optimizely.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PackageId>Geta.OEmbed.Optimizely.UI</PackageId>
<Title>Geta oEmbed Optimizely UI Package</Title>
<Authors>Geta Digital</Authors>
<Company>Geta Digital</Company>
<PackageIcon>icon.png</PackageIcon>
<PackageIconUrl>https://cdn.geta.no/opensource/icons/Geta-logo-3.png</PackageIconUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<Description>UI files for Geta Optimizely oEmbed package.</Description>
<PackageTags>Geta oEmbed Video Optimizely CMS</PackageTags>
<RepositoryType>Git</RepositoryType>
<RepositoryUrl>https://github.com/Geta/geta-oembed</RepositoryUrl>
</PropertyGroup>

<ImportGroup>
<Import Project="$(SolutionDir)\src\pack.proj" Condition="Exists('$(SolutionDir)\src\pack.proj')"/>
</ImportGroup>

<ItemGroup>
<None Include="..\..\resources\icon.png" Pack="true" PackagePath="\" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Geta.OEmbed.Optimizely\Geta.OEmbed.Optimizely.csproj" />
</ItemGroup>

</Project>
0 src/Geta.OEmbed.Optimizely/module.config → src/Geta.OEmbed.Optimizely.UI/module.config
View file
Open in desktop
File renamed without changes.
0 ...d.Optimizely/msbuild/CopyZipFiles.targets → ...ptimizely.UI/msbuild/CopyZipFiles.targets
View file
Open in desktop
File renamed without changes.
8 changes: 2 additions & 6 deletions src/Geta.OEmbed.Optimizely/Geta.OEmbed.Optimizely.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,14 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Geta.OEmbed.AspNetCore.Mvc\Geta.OEmbed.AspNetCore.Mvc.csproj" />
<ProjectReference Include="..\Geta.OEmbed.Client\Geta.OEmbed.Client.csproj" />
<ProjectReference Include="..\Geta.VideoTools.Common\Geta.VideoTools.Common.csproj" />
<ProjectReference Include="..\Geta.VideoTools.Mp4\Geta.VideoTools.Mp4.csproj" />
<ProjectReference Include="..\Geta.VideoTools.WebM\Geta.VideoTools.WebM.csproj" />
</ItemGroup>

<ImportGroup>
<Import Project="$(SolutionDir)\src\pack.proj" Condition="Exists('$(SolutionDir)\src\pack.proj')" />
</ImportGroup>

<ItemGroup>
<InternalsVisibleTo Include="$(AssemblyName).Tests" />
Expand All @@ -45,4 +41,4 @@
<None Include="..\..\resources\icon.png" Pack="true" PackagePath="\" />
</ItemGroup>

</Project>
</Project>
13 changes: 7 additions & 6 deletions src/pack.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<PropertyGroup>
<SolutionDir Condition="$(SolutionDir) == ''">$(MSBuildProjectDirectory)\..\</SolutionDir>
<TmpOutDir>$(SolutionDir)\tmp\$(TargetFramework)</TmpOutDir>
<ModuleName>Geta.OEmbed.Optimizely</ModuleName>
</PropertyGroup>

<Target Name="CreateZip" AfterTargets="Build">
Expand All @@ -35,29 +36,29 @@
<XmlPoke XmlInputPath="$(TmpOutDir)\content\module.config" Query="/module/@clientResourceRelativePath" Value="$(Version)" />
<ZipDirectory
InputPath="$(TmpOutDir)\content"
OutputFileName="$(OutputPath)\$(MSBuildProjectName).zip"
OutputFileName="$(OutputPath)\$(ModuleName).zip"
OverwriteExistingFile="true" />
<RemoveDir Directories="$(TmpOutDir)" />
</Target>

<ItemGroup>
<Content Include="$(OutputPath)\$(MSBuildProjectName).zip" >
<Content Include="$(OutputPath)\$(ModuleName).zip" >
<Pack>true</Pack>
<PackagePath>content\modules\_protected\$(MSBuildProjectName)\;contentFiles\any\any\modules\_protected\$(MSBuildProjectName)\</PackagePath>
<PackagePath>content\modules\_protected\$(ModuleName)\;contentFiles\any\any\modules\_protected\$(ModuleName)\</PackagePath>
<PackageCopyToOutput>true</PackageCopyToOutput>
<BuildAction>None</BuildAction>
</Content>
<Content Include="$(SolutionDir)\src\$(MSBuildProjectName)\msbuild\CopyZipFiles.targets" >
<Pack>true</Pack>
<PackagePath>build\net5.0\$(MSBuildProjectName).targets</PackagePath>
<PackagePath>build\net5.0\$(ModuleName).targets</PackagePath>
<PackageCopyToOutput>true</PackageCopyToOutput>
<BuildAction>None</BuildAction>
</Content>
<Content Include="$(SolutionDir)\src\$(MSBuildProjectName)\msbuild\CopyZipFiles.targets" >
<Pack>true</Pack>
<PackagePath>build\net6.0\$(MSBuildProjectName).targets</PackagePath>
<PackagePath>build\net6.0\$(ModuleName).targets</PackagePath>
<PackageCopyToOutput>true</PackageCopyToOutput>
<BuildAction>None</BuildAction>
</Content>
</ItemGroup>
</Project>
</Project>
Loading