Skip to content

Commit ce96d60

Browse files
barjonpbarjonp
committed
Attempt fix workflow
1 parent 2048bdf commit ce96d60

10 files changed

Lines changed: 78 additions & 92 deletions

File tree

‎.github/workflows/github-actions.yml‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Install DotNet
2727
uses: actions/setup-dotnet@v3
2828
with:
29-
dotnet-version: '7.0.x'
29+
dotnet-version: '9.0.102'
3030
- name: Clone repo
3131
uses: actions/checkout@v3
3232
with:
@@ -42,18 +42,15 @@ jobs:
4242
echo "Version: $version"
4343
echo "opensilver-version=$version" >> $env:GITHUB_OUTPUT
4444
echo "package-version=${{ env.next-release-version }}-${{ env.suffix }}-$(date +'%Y-%m-%d-%H%M%S')-${{ env.GITHUB_SHA_SHORT }}" >> $env:GITHUB_OUTPUT
45-
- name: Replace OpenSilver PackageVersion
45+
- name: Build OpenSilver.ControlsKit package
46+
working-directory: src\build
4647
run: |
47-
sed -i 's/<OpenSilverPackageVersion>[^<]*</<OpenSilverPackageVersion>${{ steps.vars.outputs.opensilver-version }}</g' src\Directory.Build.targets
48-
- name: Build the FastControls package
49-
working-directory: src\FastControls\build
50-
run: |
51-
./build-nuget-package.bat ${{ steps.vars.outputs.package-version }}
48+
./build-nuget-package.bat ${{ steps.vars.outputs.package-version }} ${{ steps.vars.outputs.opensilver-version }}
5249
- name: Upload artifacts
53-
uses: actions/upload-artifact@v3
50+
uses: actions/upload-artifact@v4
5451
with:
55-
name: FastControls
56-
path: src\FastControls\bin\Release\*.nupkg
52+
name: ControlsKit
53+
path: src\build\output\ControlsKit\*.nupkg
5754
- name: Upload packages to MyGet
5855
run: |
59-
dotnet nuget push "src\FastControls\bin\Release\*.nupkg" -k ${{ secrets.MYGET_TOKEN }} -s ${{ secrets.MYGET_PUBLIC_FEED }}
56+
dotnet nuget push "src\build\output\ControlsKit\*.nupkg" -k ${{ secrets.MYGET_TOKEN }} -s ${{ secrets.MYGET_PUBLIC_FEED }}

‎src/Directory.Build.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<OpenSilverPackageVersion>2.1.0-preview-2023-10-24-151123-d105dd0c</OpenSilverPackageVersion>
3+
<OpenSilverVersion Condition=" '$(OpenSilverVersion)' == '' ">3.2.0</OpenSilverVersion>
44
<EnableAdditionalMetadataAttributes>true</EnableAdditionalMetadataAttributes>
55
<LangVersion>latest</LangVersion>
66
</PropertyGroup>

‎src/FastControls.TestApp/FastControls.TestApp.Browser/FastControls.TestApp.Browser.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
1414
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.11" PrivateAssets="all" />
15-
<PackageReference Include="OpenSilver.WebAssembly" Version="3.2.0" />
15+
<PackageReference Include="OpenSilver.WebAssembly" Version="[$(OpenSilverVersion)]" />
1616
</ItemGroup>
1717

1818
<PropertyGroup>
19-
<DisableImplicitNamespaceImports>True</DisableImplicitNamespaceImports>
19+
<DisableImplicitNamespaceImports>True</DisableImplicitNamespaceImports>
2020
</PropertyGroup>
2121

2222
<ItemGroup>

‎src/FastControls.TestApp/FastControls.TestApp.Simulator/FastControls.TestApp.Simulator.csproj‎

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

3-
<PropertyGroup>
4-
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net8.0-windows</TargetFramework>
6-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>WinExe</OutputType>
5+
<TargetFramework>net8.0-windows</TargetFramework>
6+
</PropertyGroup>
77

8-
<ItemGroup>
9-
<PackageReference Include="OpenSilver.Simulator" Version="3.2.0" />
10-
</ItemGroup>
8+
<ItemGroup>
9+
<PackageReference Include="OpenSilver.Simulator" Version="[$(OpenSilverVersion)]" />
10+
</ItemGroup>
1111

12-
<ItemGroup>
13-
<ProjectReference Include="..\FastControls.TestApp\FastControls.TestApp.csproj" />
14-
</ItemGroup>
12+
<ItemGroup>
13+
<ProjectReference Include="..\FastControls.TestApp\FastControls.TestApp.csproj" />
14+
</ItemGroup>
1515

1616
</Project>

‎src/FastControls.TestApp/FastControls.TestApp/FastControls.TestApp.csproj‎

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

99
<ItemGroup>
10-
<PackageReference Include="OpenSilver" Version="3.2.0" />
10+
<PackageReference Include="OpenSilver" Version="[$(OpenSilverVersion)]" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎src/FastControls/OpenSilver.ControlsKit.FastControls.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
<GenerateDocumentationFile>True</GenerateDocumentationFile>
1717
</PropertyGroup>
1818

19-
2019
<ItemGroup>
21-
<PackageReference Include="OpenSilver" Version="3.2.0" />
20+
<PackageReference Include="OpenSilver" Version="[$(OpenSilverVersion)]" />
2221
</ItemGroup>
2322

2423
</Project>

‎src/FastControls/build/build-nuget-package.bat‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/OpenSilver.ControlsKit.Controls/OpenSilver.ControlsKit.Controls.csproj‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<RootNamespace>OpenSilver.ControlsKit</RootNamespace>
6-
<Authors>Userware</Authors>
7-
<ProjectUrl>https://www.opensilver.net</ProjectUrl>
8-
<Description>The ControlsKit.Controls is a collection of controls that developers can use directly in their OpenSilver projects, to complement the built-in controls.</Description>
9-
<Copyright>Copyright (c) 2023, Userware. All rights reserved.</Copyright>
10-
<Title>OpenSilver Controls Kit</Title>
11-
<PackageProjectUrl>https://github.com/OpenSilver/OpenSilver.ControlsKit</PackageProjectUrl>
12-
<PackageReadmeFile></PackageReadmeFile>
13-
<RepositoryUrl>https://github.com/OpenSilver/OpenSilver.ControlsKit</RepositoryUrl>
14-
<RepositoryType>git</RepositoryType>
15-
<PackageTags>OpenSilver Controls Xaml</PackageTags>
16-
<GenerateDocumentationFile>True</GenerateDocumentationFile>
5+
<RootNamespace>OpenSilver.ControlsKit</RootNamespace>
6+
<Authors>Userware</Authors>
7+
<ProjectUrl>https://www.opensilver.net</ProjectUrl>
8+
<Description>The ControlsKit.Controls is a collection of controls that developers can use directly in their OpenSilver projects, to complement the built-in controls.</Description>
9+
<Copyright>Copyright (c) 2023, Userware. All rights reserved.</Copyright>
10+
<Title>OpenSilver Controls Kit</Title>
11+
<PackageProjectUrl>https://github.com/OpenSilver/OpenSilver.ControlsKit</PackageProjectUrl>
12+
<PackageReadmeFile></PackageReadmeFile>
13+
<RepositoryUrl>https://github.com/OpenSilver/OpenSilver.ControlsKit</RepositoryUrl>
14+
<RepositoryType>git</RepositoryType>
15+
<PackageTags>OpenSilver Controls Xaml</PackageTags>
16+
<GenerateDocumentationFile>True</GenerateDocumentationFile>
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="OpenSilver" Version="3.2.0" />
20+
<PackageReference Include="OpenSilver" Version="[$(OpenSilverVersion)]" />
2121
</ItemGroup>
2222

2323
</Project>

‎src/build/build-nuget-package.bat‎

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,53 @@
1-
@echo off
1+
@ECHO off
22

3-
IF NOT EXIST "nuspec/ControlsKit.nuspec" (
4-
echo Wrong working directory. Please navigate to the folder that contains the BAT file before executing it.
5-
PAUSE
6-
EXIT
7-
)
3+
SETLOCAL
84

9-
rem Define the escape character for colored text
10-
for /F %%a in ('"prompt $E$S & echo on & for %%b in (1) do rem"') do set "ESC=%%a"
5+
IF "%~1" == "--help" (
6+
GOTO :help
7+
)
118

12-
echo.
13-
echo %ESC%[95mRestoring NuGet packages%ESC%[0m
14-
echo.
15-
dotnet restore "%~dp0..\FastControls\OpenSilver.ControlsKit.FastControls.csproj"
16-
dotnet restore "%~dp0..\OpenSilver.ControlsKit.Controls\OpenSilver.ControlsKit.Controls.csproj"
9+
IF "%~1" == "-h" (
10+
GOTO :help
11+
)
1712

18-
rem If argument 1 is not given, ask for PackageVersion:
19-
set PackageVersion=%1
20-
if /i "%PackageVersion%" EQU "" (
21-
set /p PackageVersion="%ESC% Package version:%ESC% "
13+
SET CFG=Release
14+
SET BUILD_DIR=%~dp0
15+
16+
REM Define the escape character for colored text
17+
FOR /F %%a IN ('"prompt $E$S & echo on & for %%b in (1) do rem"') DO SET "ESC=%%a"
18+
19+
REM Define the PackageVersion and OpenSilverPkgVersion variables
20+
IF "%~1" == "" (
21+
SET /P PackageVersion="%ESC%[92mOpenSilver.ControlsKit version:%ESC%[0m "
22+
SET /P OpenSilverPkgVersion="%ESC%[92mOpenSilver version:%ESC%[0m "
23+
) ELSE (
24+
SET PackageVersion=%1
25+
IF "%~2" == "" (
26+
SET OpenSilverPkgVersion=%1
27+
) ELSE (
28+
SET OpenSilverPkgVersion=%2
29+
)
2230
)
2331

24-
rem If argument 2 is not given, use default value for OpenSilverVersion:
25-
set "OpenSilverVersion=%~2"
26-
if not defined OpenSilverVersion set "OpenSilverVersion=3.2.0"
32+
ECHO.
33+
ECHO %ESC%[95mBuilding %ESC%[0mFastControl %CFG% %ESC%[95mconfiguration%ESC%[0m
34+
ECHO.
35+
msbuild "%BUILD_DIR%..\FastControls\OpenSilver.ControlsKit.FastControls.csproj" -p:Configuration=%CFG%;OpenSilverVersion=%OpenSilverPkgVersion% -verbosity:minimal -restore
2736

28-
rem Get the current date and time:
29-
for /F "tokens=2" %%i in ('date /t') do set currentdate=%%i
30-
set currenttime=%time%
37+
ECHO.
38+
ECHO %ESC%[95mBuilding %ESC%[0mControlsKit %CFG% %ESC%[95mconfiguration%ESC%[0m
39+
ECHO.
40+
msbuild "%BUILD_DIR%..\OpenSilver.ControlsKit.Controls\OpenSilver.ControlsKit.Controls.csproj" -p:Configuration=%CFG%;OpenSilverVersion=%OpenSilverPkgVersion% -verbosity:minimal -restore
3141

32-
rem Create a Version.txt file with the date:
33-
md temp
34-
@echo OpenSilver.ControlsKit %PackageVersion% (%currentdate% %currenttime%)> temp/Version.txt
42+
ECHO.
43+
ECHO %ESC%[95mPacking %ESC%[0mOpenSilver.ControlsKit %ESC%[95mNuGet package%ESC%[0m
44+
ECHO.
45+
%BUILD_DIR%\nuget.exe pack %BUILD_DIR%\nuspec\ControlsKit.nuspec -OutputDirectory "%BUILD_DIR%\output\ControlsKit" -Properties "PackageVersion=%PackageVersion%;Configuration=%CFG%;OpenSilverVersion=%OpenSilverPkgVersion%;RepositoryUrl=https://github.com/OpenSilver/OpenSilver.ControlsKit"
3546

36-
echo.
37-
echo %ESC%[95mBuilding %ESC%[0m FastControl Release %ESC%[95mconfiguration%ESC%[0m
38-
echo.
39-
msbuild "%~dp0..\FastControls\OpenSilver.ControlsKit.FastControls.csproj" -p:Configuration=Release -p:DebugSymbols=true -p:Optimize=true -p:GenerateDocumentation=true -clp:ErrorsOnly -restore
47+
EXIT /b
4048

41-
echo.
42-
echo %ESC%[95mBuilding %ESC%[0m Controls Release %ESC%[95mconfiguration%ESC%[0m
43-
echo.
44-
msbuild "%~dp0..\OpenSilver.ControlsKit.Controls\OpenSilver.ControlsKit.Controls.csproj" -p:Configuration=Release -p:DebugSymbols=true -p:Optimize=true -p:GenerateDocumentation=true -clp:ErrorsOnly -restore
49+
:help
50+
ECHO [1] OpenSilver.ControlsKit NuGet package Version
51+
ECHO [2] OpenSilver Version
4552

46-
echo.
47-
echo %ESC%[95mPacking %ESC%[0mOpenSilver.ControlsKit.Controls %ESC%[95mNuGet package%ESC%[0m
48-
echo.
49-
nuget.exe pack nuspec\ControlsKit.nuspec -OutputDirectory "output/ControlsKit" -Properties "PackageVersion=%PackageVersion%;Configuration=Release;OpenSilverVersion=%OpenSilverVersion%;RepositoryUrl=https://github.com/OpenSilver/OpenSilver.ControlsKit"
53+
ENDLOCAL

‎src/build/nuspec/ControlsKit.nuspec‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,14 @@
2424
<files>
2525
<!-- ControlsKit.Controls -->
2626
<file src="../../OpenSilver.ControlsKit.Controls/bin/$Configuration$/netstandard2.0/OpenSilver.ControlsKit.Controls.dll" target="lib/netstandard2.0/OpenSilver.ControlsKit.Controls.dll" />
27-
<file src="../../OpenSilver.ControlsKit.Controls/bin/$Configuration$/netstandard2.0/OpenSilver.ControlsKit.Controls.pdb" target="lib/netstandard2.0/OpenSilver.ControlsKit.Controls.pdb" />
2827
<file src="../../OpenSilver.ControlsKit.Controls/bin/$Configuration$/netstandard2.0/OpenSilver.ControlsKit.Controls.xml" target="lib/netstandard2.0/OpenSilver.ControlsKit.Controls.xml" />
2928

3029
<!-- ControlsKit.FastControls -->
3130
<file src="../../FastControls/bin/$Configuration$/netstandard2.0/OpenSilver.ControlsKit.FastControls.dll" target="lib/netstandard2.0/OpenSilver.ControlsKit.FastControls.dll" />
32-
<file src="../../FastControls/bin/$Configuration$/netstandard2.0/OpenSilver.ControlsKit.FastControls.pdb" target="lib/netstandard2.0/OpenSilver.ControlsKit.FastControls.pdb" />
3331
<file src="../../FastControls/bin/$Configuration$/netstandard2.0/OpenSilver.ControlsKit.FastControls.xml" target="lib/netstandard2.0/OpenSilver.ControlsKit.FastControls.xml" />
3432

3533

3634
<!-- OpenSilver icon -->
3735
<file src="OpenSilver_icon.png" target="images\OpenSilver_icon.png" />
38-
39-
<!-- Version.txt file (dynamically generated by the .BAT file) -->
40-
<file src="../temp/Version.txt" target="Version.txt" />
4136
</files>
4237
</package>

0 commit comments

Comments
 (0)