Skip to content

Commit 1ee22e5

Browse files
committed
Update build
1 parent a73388c commit 1ee22e5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+493
-3769
lines changed

.github/workflows/github-actions.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: OpenSilver.SilverlightContrib Build
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
opensilver-version:
7+
description: 'OpenSilver version'
8+
required: true
9+
version:
10+
description: 'OpenSilver.SilverlightContrib package version'
11+
required: true
12+
13+
jobs:
14+
Build-Pack-Publish:
15+
if: github.repository_owner == 'OpenSilver'
16+
runs-on: windows-latest
17+
steps:
18+
- uses: microsoft/[email protected]
19+
- name: Inject slug/short variables
20+
uses: rlespinasse/[email protected]
21+
- uses: actions/setup-dotnet@v1
22+
with:
23+
dotnet-version: '8.0.x'
24+
- name: Clone SilverlightContrib repo
25+
uses: actions/checkout@v2
26+
with:
27+
ref: ${{ github.ref }}
28+
- name: Build OpenSilver.SilverlightContrib NuGet package
29+
run: ./build/Build_NuGet.bat ${{ github.event.inputs.version }} ${{ github.event.inputs.opensilver-version }}
30+
- name: Upload packages to MyGet
31+
run: |
32+
dotnet nuget push "build\output\*.nupkg" -k ${{ secrets.MYGET_TOKEN }} -s https://www.myget.org/F/opensilver/api/v2/package

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,3 +398,6 @@ FodyWeavers.xsd
398398
*.sln.iml
399399

400400
build/output/*
401+
402+
SilverlightContrib.Sample.Browser/wwwroot/libs/
403+
SilverlightContrib.Sample.Browser/wwwroot/resources/

Directory.Build.targets

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<OpenSilverVersion Condition=" '$(OpenSilverVersion)' == '' ">3.0.1</OpenSilverVersion>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<PackageReference Include="OpenSilver" Version="$(OpenSilverVersion)" Condition=" '$(UseOpenSilver)' == 'true' "/>
9+
</ItemGroup>
10+
11+
</Project>

NuGet.Config

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
5+
<add key="myget.org" value="https://www.myget.org/F/opensilver/api/v3/index.json" />
6+
</packageSources>
7+
</configuration>
Lines changed: 51 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,53 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>netstandard2.0</TargetFramework>
4-
<EnableDefaultItems>false</EnableDefaultItems>
5-
<DefineSilverlight>true</DefineSilverlight>
6-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
7-
<AssemblyName>SilverlightContrib.Controls</AssemblyName>
8-
</PropertyGroup>
9-
<ItemGroup>
10-
<PackageReference Include="OpenSilver" Version="3.0.1" />
11-
</ItemGroup>
12-
<ItemGroup>
13-
<Compile Include="..\Solution Items\VersionInfo.cs">
14-
<Link>Properties\VersionInfo.cs</Link>
15-
</Compile>
16-
<Compile Include="ColorPicker\ColorPicker.cs" />
17-
<Compile Include="ColorPicker\SelectedColorEventArgs.cs" />
18-
<Compile Include="ColorPicker\ColorSpace.cs" />
19-
<Compile Include="ColorPicker\HSV.cs" />
20-
<Compile Include="CoolMenu\CoolMenu.cs" />
21-
<Compile Include="CoolMenu\CoolMenuItem.cs" />
22-
<Compile Include="CoolMenu\CoolMenuItemContainerGenerator.cs" />
23-
<Compile Include="CoolMenu\Behaviors\DefaultCoolMenuBehavior.cs" />
24-
<Compile Include="CoolMenu\Behaviors\ICoolMenuBehavior.cs" />
25-
<Compile Include="CoolMenu\SelectedMenuItemArgs.cs" />
26-
<Compile Include="Emf\BaseSource.cs" />
27-
<Compile Include="Emf\DownloadProgressEventArgs.cs" />
28-
<Compile Include="Emf\Emf.cs" />
29-
<Compile Include="Emf\EmfSource.cs" />
30-
<Compile Include="Emf\EmfSourceConverter.cs" />
31-
<Compile Include="Emf\ExceptionEventArgs.cs" />
32-
<Compile Include="Emf\UriTypeConverter.cs" />
33-
<Compile Include="GroupBox\GroupBox.cs" />
34-
<Compile Include="Properties\AssemblyInfo.cs" />
35-
<Compile Include="SliderGauge\PercentageChangedEventArgs.cs" />
36-
<Compile Include="SliderGauge\SliderGauge.cs" />
37-
<Compile Include="StarSelector\RatingChangedEventArgs.cs" />
38-
<Compile Include="StarSelector\Star.cs" />
39-
<Compile Include="StarSelector\StarSelector.cs" />
40-
</ItemGroup>
41-
<ItemGroup>
42-
<ProjectReference Include="..\SilverlightContrib\SilverlightContrib.Opensilver.csproj">
43-
<Project>{FB7C04D9-18C1-4EDD-AA8D-28FA6400E629}</Project>
44-
<Name>SilverlightContrib</Name>
45-
</ProjectReference>
46-
</ItemGroup>
47-
<ItemGroup>
48-
<Page Include="themes\generic.xaml">
49-
<Generator>MSBuild:MarkupCompilePass1</Generator>
50-
<SubType>Designer</SubType>
51-
<Generator>MSBuild:Compile</Generator>
52-
<SubType>Designer</SubType>
53-
</Page>
54-
</ItemGroup>
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<EnableDefaultItems>false</EnableDefaultItems>
6+
<DefineSilverlight>true</DefineSilverlight>
7+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8+
<AssemblyName>SilverlightContrib.Controls</AssemblyName>
9+
<UseOpenSilver>true</UseOpenSilver>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<ProjectReference Include="..\SilverlightContrib\SilverlightContrib.Opensilver.csproj"/>
14+
</ItemGroup>
15+
16+
<ItemGroup>
17+
<Compile Include="..\Solution Items\VersionInfo.cs">
18+
<Link>Properties\VersionInfo.cs</Link>
19+
</Compile>
20+
<Compile Include="ColorPicker\ColorPicker.cs" />
21+
<Compile Include="ColorPicker\SelectedColorEventArgs.cs" />
22+
<Compile Include="ColorPicker\ColorSpace.cs" />
23+
<Compile Include="ColorPicker\HSV.cs" />
24+
<Compile Include="CoolMenu\CoolMenu.cs" />
25+
<Compile Include="CoolMenu\CoolMenuItem.cs" />
26+
<Compile Include="CoolMenu\CoolMenuItemContainerGenerator.cs" />
27+
<Compile Include="CoolMenu\Behaviors\DefaultCoolMenuBehavior.cs" />
28+
<Compile Include="CoolMenu\Behaviors\ICoolMenuBehavior.cs" />
29+
<Compile Include="CoolMenu\SelectedMenuItemArgs.cs" />
30+
<Compile Include="Emf\BaseSource.cs" />
31+
<Compile Include="Emf\DownloadProgressEventArgs.cs" />
32+
<Compile Include="Emf\Emf.cs" />
33+
<Compile Include="Emf\EmfSource.cs" />
34+
<Compile Include="Emf\EmfSourceConverter.cs" />
35+
<Compile Include="Emf\ExceptionEventArgs.cs" />
36+
<Compile Include="Emf\UriTypeConverter.cs" />
37+
<Compile Include="GroupBox\GroupBox.cs" />
38+
<Compile Include="Properties\AssemblyInfo.cs" />
39+
<Compile Include="SliderGauge\PercentageChangedEventArgs.cs" />
40+
<Compile Include="SliderGauge\SliderGauge.cs" />
41+
<Compile Include="StarSelector\RatingChangedEventArgs.cs" />
42+
<Compile Include="StarSelector\Star.cs" />
43+
<Compile Include="StarSelector\StarSelector.cs" />
44+
</ItemGroup>
45+
46+
<ItemGroup>
47+
<Page Include="themes\generic.xaml">
48+
<Generator>MSBuild:Compile</Generator>
49+
<SubType>Designer</SubType>
50+
</Page>
51+
</ItemGroup>
52+
5553
</Project>

SilverlightContrib.Data/Services/DataServiceContext.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
using System.Windows.Media;
99
using System.Windows.Media.Animation;
1010
using System.Windows.Shapes;
11+
#if OPENSILVER
12+
using Microsoft.OData.Client;
13+
#else
1114
using System.Data.Services.Client;
15+
#endif
1216
using System.IO;
1317
using System.Linq;
1418
using System.Xml;

SilverlightContrib.Data/Services/IOrderedQueryExtensions.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99
using System.Windows.Media.Animation;
1010
using System.Windows.Shapes;
1111
using System.Linq;
12+
#if OPENSILVER
13+
using Microsoft.OData.Client;
14+
#else
1215
using System.Data.Services.Client;
16+
#endif
1317
using System.Collections.Generic;
1418

1519
namespace SilverlightContrib.Data.Services.Extensions
Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>netstandard2.0</TargetFramework>
4-
<EnableDefaultItems>false</EnableDefaultItems>
5-
<DefineSilverlight>true</DefineSilverlight>
6-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
7-
<AssemblyName>SilverlightContrib.Data</AssemblyName>
8-
</PropertyGroup>
9-
<ItemGroup>
10-
<PackageReference Include="OpenSilver" Version="3.0.1" />
11-
</ItemGroup>
12-
<ItemGroup>
13-
<Compile Include="..\Solution Items\VersionInfo.cs">
14-
<Link>Properties\VersionInfo.cs</Link>
15-
</Compile>
16-
<Compile Include="Converters\CharTypeConverter.cs" />
17-
<Compile Include="Converters\DateTimeConverter.cs" />
18-
<Compile Include="Converters\HtmlDecodeConverter.cs" />
19-
<Compile Include="Converters\MoneyConverter.cs" />
20-
<Compile Include="Converters\StringFormatConverter.cs" />
21-
<Compile Include="Properties\AssemblyInfo.cs" />
22-
<Compile Include="Services\DataServiceContext.cs" />
23-
<Compile Include="Services\DataServiceEntityBase.cs" />
24-
<Compile Include="Services\IOrderedQueryExtensions.cs" />
25-
<Compile Include="Services\NonEntityOperationResult.cs" />
26-
</ItemGroup>
27-
<ItemGroup>
28-
<Reference Include="System.Data.Services.Client">
29-
<HintPath>I:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.Services.Client.dll</HintPath>
30-
</Reference>
31-
</ItemGroup>
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<EnableDefaultItems>false</EnableDefaultItems>
6+
<DefineSilverlight>true</DefineSilverlight>
7+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8+
<AssemblyName>SilverlightContrib.Data</AssemblyName>
9+
<UseOpenSilver>true</UseOpenSilver>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Include="Microsoft.OData.Client" Version="7.21.4" />
14+
</ItemGroup>
15+
16+
<ItemGroup>
17+
<Compile Include="..\Solution Items\VersionInfo.cs">
18+
<Link>Properties\VersionInfo.cs</Link>
19+
</Compile>
20+
<Compile Include="Converters\CharTypeConverter.cs" />
21+
<Compile Include="Converters\DateTimeConverter.cs" />
22+
<Compile Include="Converters\HtmlDecodeConverter.cs" />
23+
<Compile Include="Converters\MoneyConverter.cs" />
24+
<Compile Include="Converters\StringFormatConverter.cs" />
25+
<Compile Include="Properties\AssemblyInfo.cs" />
26+
<Compile Include="Services\DataServiceContext.cs" />
27+
<Compile Include="Services\DataServiceEntityBase.cs" />
28+
<Compile Include="Services\IOrderedQueryExtensions.cs" />
29+
<Compile Include="Services\NonEntityOperationResult.cs" />
30+
</ItemGroup>
31+
3232
</Project>

SilverlightContrib.Opensilver.sln

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ VisualStudioVersion = 17.9.34728.123
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F4FE2B6D-D968-4933-958C-AF629A028994}"
77
ProjectSection(SolutionItems) = preProject
8+
.gitignore = .gitignore
9+
Directory.Build.targets = Directory.Build.targets
10+
.github\workflows\github-actions.yml = .github\workflows\github-actions.yml
811
License.txt = License.txt
12+
NuGet.Config = NuGet.Config
913
ReadMe.txt = ReadMe.txt
1014
Solution Items\VersionInfo.cs = Solution Items\VersionInfo.cs
1115
EndProjectSection
1216
EndProject
13-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{600FC932-42D6-4298-B9EF-A87A140B37D4}"
14-
EndProject
1517
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SilverlightContrib.Opensilver", "SilverlightContrib\SilverlightContrib.Opensilver.csproj", "{FB7C04D9-18C1-4EDD-AA8D-28FA6400E629}"
1618
EndProject
1719
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SilverlightContrib.Sample.Opensilver", "SilverlightContrib.Sample\SilverlightContrib.Sample.Opensilver.csproj", "{7181276F-AE2A-42FE-9AEF-8C82CD914667}"
@@ -22,6 +24,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SilverlightContrib.Data.Ope
2224
EndProject
2325
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SilverlightContrib.Sample.Browser", "SilverlightContrib.Sample.Browser\SilverlightContrib.Sample.Browser.csproj", "{21B08E46-4672-4DD3-AC88-06E2E6C3B646}"
2426
EndProject
27+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5E0178DE-781B-4015-B63F-0DB74776F91B}"
28+
EndProject
2529
Global
2630
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2731
Debug|.NET = Debug|.NET
@@ -88,4 +92,11 @@ Global
8892
GlobalSection(SolutionProperties) = preSolution
8993
HideSolutionNode = FALSE
9094
EndGlobalSection
95+
GlobalSection(NestedProjects) = preSolution
96+
{7181276F-AE2A-42FE-9AEF-8C82CD914667} = {5E0178DE-781B-4015-B63F-0DB74776F91B}
97+
{21B08E46-4672-4DD3-AC88-06E2E6C3B646} = {5E0178DE-781B-4015-B63F-0DB74776F91B}
98+
EndGlobalSection
99+
GlobalSection(ExtensibilityGlobals) = postSolution
100+
SolutionGuid = {BB7DF526-A6D4-423C-AD1A-4F544E63C30C}
101+
EndGlobalSection
91102
EndGlobal

SilverlightContrib.Sample.Browser/SilverlightContrib.Sample.Browser.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<NoXamlPreprocessor>True</NoXamlPreprocessor>
66
<OpenSilverType>6</OpenSilverType>
77
<PublishTrimmed>true</PublishTrimmed>
8+
<UseOpenSilver>true</UseOpenSilver>
89
<!-- Uncomment to enable AOT compilation when publishing -->
910
<!--<RunAOTCompilation>true</RunAOTCompilation>-->
1011
</PropertyGroup>
1112

1213
<ItemGroup>
13-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
14-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
15-
<PackageReference Include="OpenSilver" Version="3.0.1" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
15+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
1616
</ItemGroup>
1717

1818
<PropertyGroup>

0 commit comments

Comments
 (0)