Skip to content

Commit 98ebc21

Browse files
barjonpbarjonp
committed
Update workflow
1 parent 258dbbc commit 98ebc21

File tree

9 files changed

+41
-41
lines changed

9 files changed

+41
-41
lines changed

‎.github/workflows/build-telerik-showcase.yml

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,21 @@ env:
66
virtual-directory-release: '/telerikshowcase/release/'
77
app-path-release: 'opensilverdemos/telerikshowcase/release/'
88
deploy-service-url: 'opensilverdemos.scm.azurewebsites.net:443'
9-
next-release-version: '1.2.0'
109

1110
on:
1211
workflow_dispatch:
1312
inputs:
13+
opensilver-version:
14+
description: 'OpenSilver version'
15+
default: '3.2.0'
16+
required: true
17+
opensilver-controlskit-version:
18+
description: 'OpenSilver.ControlsKit version'
19+
default: '3.2.0'
20+
required: true
1421
telerik-version:
15-
description: 'Telerik version to use'
16-
default: '2.0.0'
22+
description: 'OpenSilver.TelerikUI version'
23+
default: '3.2.0'
1724
required: true
1825
telerik-options:
1926
type: choice
@@ -41,7 +48,7 @@ jobs:
4148
uses: rlespinasse/[email protected]
4249
- uses: actions/setup-dotnet@v1
4350
with:
44-
dotnet-version: '7.0.200'
51+
dotnet-version: '9.0.102'
4552
- name: Clone Telerik Showcase
4653
uses: actions/checkout@v2
4754
with:
@@ -51,31 +58,14 @@ jobs:
5158
mv Nuget.default.Config Nuget.Config
5259
- name: Replace text in Nuget.Config
5360
run: |
54-
sed -i 's\myget_username\${{ secrets.MYGET_USERNAME }}\" />\g' Nuget.Config
55-
sed -i 's\myget_password\${{ secrets.MYGET_PASSWORD }}\" />\g' Nuget.Config
56-
- name: Get OpenSilver version
57-
run: |
58-
nuget install OpenSilver.Compatibility.TelerikUI.4.6 -source https://www.myget.org/F/opensilver-private/api/v3/index.json -source https://www.myget.org/F/opensilver-private-rc/api/v3/index.json -source https://www.myget.org/F/opensilver/api/v3/index.json -source https://api.nuget.org/v3/index.json -version ${{ github.event.inputs.telerik-version }} -output TelerikInstall
59-
ls TelerikInstall
60-
$opensilver_version = ls TelerikInstall -Filter OpenSilver.2* | % { $_.name }
61-
$opensilver_version = $opensilver_version.Split(".", 2)[1]
62-
echo $opensilver_version
63-
echo "opensilver_version=$opensilver_version" >> $env:GITHUB_ENV
64-
- name: Replace text
65-
run: |
66-
sed -zi 's\1.1.0\${{ github.event.inputs.telerik-version }}\2g' OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.csproj
67-
# sed -i 's\OpenSilver.Compatibility.TelerikUI\OpenSilver.Compatibility.TelerikUI.4.6\g' OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.csproj
68-
sed -i 's\1.1.0\${{ env.opensilver_version }}\g' OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.csproj
69-
sed -i 's\1.1.0\${{ env.opensilver_version }}\g' OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/OpenSilver.Samples.TelerikUI.Browser.csproj
70-
- name: Restore Showcase packages
71-
run: |
72-
nuget restore OpenSilver.Samples.TelerikUI.sln
61+
sed -i 's|myget_username|${{ secrets.MYGET_USERNAME }}|g' Nuget.Config
62+
sed -i 's|myget_password|${{ secrets.MYGET_PASSWORD }}|g' Nuget.Config
7363
- name: Replace text
7464
run: |
75-
sed -i 's\<base href=\"/\" />\<base href=\"${{ env.vdir }}\" />\g' OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/wwwroot/index.html
65+
sed -i 's|<base href="/" />|<base href="https://github.com/$%7B%7B%20env.vdir%20%7D%7D" />|g' OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/wwwroot/index.html
7666
- name: Replace UserName
7767
run: |
78-
sed -i 's\USERNAME\${{ secrets.OPENSILVERDEMOSUSERNAME }}\g' OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Properties/PublishProfiles/publish.pubxml
68+
sed -i 's|USERNAME|${{ secrets.OPENSILVERDEMOSUSERNAME }}|g' OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Properties/PublishProfiles/publish.pubxml
7969
- name: Build and Deploy
8070
run: |
81-
msbuild OpenSilver.Samples.TelerikUI\OpenSilver.Samples.TelerikUI.Browser\OpenSilver.Samples.TelerikUI.Browser.csproj /p:DeployOnBuild=true /p:PublishProfile="OpenSilver.Samples.TelerikUI\OpenSilver.Samples.TelerikUI.Browser\Properties\PublishProfiles\publish.pubxml" /p:Password=${{ secrets.OPENSILVERDEMOSUSERPWD }} /p:DeployIisAppPath=${{ env.apath }} /p:MSDeployServiceURL=${{ env.deploy-service-url }} /p:Configuration=Release
71+
msbuild OpenSilver.Samples.TelerikUI\OpenSilver.Samples.TelerikUI.Browser\OpenSilver.Samples.TelerikUI.Browser.csproj /p:DeployOnBuild=true /p:PublishProfile="OpenSilver.Samples.TelerikUI\OpenSilver.Samples.TelerikUI.Browser\Properties\PublishProfiles\publish.pubxml" /p:Password=${{ secrets.OPENSILVERDEMOSUSERPWD }} /p:DeployIisAppPath=${{ env.apath }} /p:MSDeployServiceURL=${{ env.deploy-service-url }} /p:Configuration=Release /p:OpenSilverVersion=${{ github.event.inputs.opensilver-version }} /p:TelerikVersion=${{ github.event.inputs.telerik-version }} /p:OpenSilverControlsKitVersion=${{ github.event.inputs.opensilver-controlskit-version }} -restore

‎Directory.Build.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<PropertyGroup>
3+
<OpenSilverVersion Condition=" '$(OpenSilverVersion)' == '' ">3.2.0</OpenSilverVersion>
4+
<OpenSilverControlsKitVersion Condition=" '$(OpenSilverControlsKitVersion)' == '' ">3.2.0</OpenSilverControlsKitVersion>
5+
<TelerikVersion Condition=" '$(TelerikVersion)' == '' ">3.2.0</TelerikVersion>
6+
</PropertyGroup>
7+
</Project>

‎OpenSilver.Samples.TelerikUI.sln

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSilver.Samples.TelerikU
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSilver.Samples.TelerikUI.Simulator.VB", "OpenSilver.Samples.TelerikUI\OpenSilver.Samples.TelerikUI.Simulator\OpenSilver.Samples.TelerikUI.Simulator.VB.csproj", "{48250897-203A-4AAD-92FA-64972ECCCCF3}"
2121
EndProject
22+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Solution Items", ".Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}"
23+
ProjectSection(SolutionItems) = preProject
24+
.github\workflows\build-telerik-showcase.yml = .github\workflows\build-telerik-showcase.yml
25+
Directory.Build.props = Directory.Build.props
26+
Nuget.default.Config = Nuget.default.Config
27+
EndProjectSection
28+
EndProject
2229
Global
2330
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2431
Debug|Any CPU = Debug|Any CPU

‎OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/OpenSilver.Samples.TelerikUI.Browser.VB.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
1515
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
16-
<PackageReference Include="OpenSilver.WebAssembly" Version="3.2.0" />
16+
<PackageReference Include="OpenSilver.WebAssembly" Version="[$(OpenSilverVersion)]" />
1717
</ItemGroup>
18-
18+
1919
<ItemGroup>
2020
<ProjectReference Include="..\OpenSilver.Samples.TelerikUI\OpenSilver.Samples.TelerikUI.vbproj" />
2121
</ItemGroup>

‎OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/OpenSilver.Samples.TelerikUI.Browser.csproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,11 @@
1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
1515
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
16-
<PackageReference Include="OpenSilver.WebAssembly" Version="3.2.0" />
16+
<PackageReference Include="OpenSilver.WebAssembly" Version="[$(OpenSilverVersion)]" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
2020
<ProjectReference Include="..\OpenSilver.Samples.TelerikUI\OpenSilver.Samples.TelerikUI.csproj" />
2121
</ItemGroup>
2222

23-
<ItemGroup>
24-
<None Remove="EmptyOpenSilverMigrationApplication.Browser.csproj.vspscc" />
25-
</ItemGroup>
26-
2723
</Project>

‎OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Simulator/OpenSilver.Samples.TelerikUI.Simulator.VB.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="OpenSilver.Simulator" Version="3.2.0" />
11+
<PackageReference Include="OpenSilver.Simulator" Version="[$(OpenSilverVersion)]" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Simulator/OpenSilver.Samples.TelerikUI.Simulator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="OpenSilver.Simulator" Version="3.2.0" />
11+
<PackageReference Include="OpenSilver.Simulator" Version="[$(OpenSilverVersion)]" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="OpenSilver" Version="3.2.0" />
12-
<PackageReference Include="OpenSilver.Compatibility.TelerikUI.4.6" Version="3.2.0" />
13-
<PackageReference Include="OpenSilver.ControlsKit" Version="3.2.0" />
11+
<PackageReference Include="OpenSilver" Version="[$(OpenSilverVersion)]" />
12+
<PackageReference Include="OpenSilver.Compatibility.TelerikUI.4.6" Version="[$(TelerikVersion)]" />
13+
<PackageReference Include="OpenSilver.ControlsKit" Version="[$(OpenSilverControlsKitVersion)]" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.vbproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="OpenSilver" Version="3.2.0" />
18-
<PackageReference Include="OpenSilver.Compatibility.TelerikUI.4.6" Version="3.2.0" />
19-
<PackageReference Include="OpenSilver.ControlsKit" Version="3.2.0" />
17+
<PackageReference Include="OpenSilver" Version="[$(OpenSilverVersion)]" />
18+
<PackageReference Include="OpenSilver.Compatibility.TelerikUI.4.6" Version="[$(TelerikVersion)]" />
19+
<PackageReference Include="OpenSilver.ControlsKit" Version="[$(OpenSilverControlsKitVersion)]" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

0 commit comments

Comments
 (0)