Skip to content

Commit db286d7

Browse files
epsmaeepsmae
authored
Merge pull request #12 from epsmae/feature/net6
Feature/net6
2 parents 35a7318 + 41c22d9 commit db286d7

55 files changed

Lines changed: 121 additions & 1767 deletions

Some content is hidden

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

‎Deploy/build_scripts/build_and_create_artefacts.cmd‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
2-
31
RD /S /Q ..\..\Develop\Replace.App\bin
4-
RD /S /Q ..\..\Develop\Replace\bin
52

63
call build_and_publish.cmd
7-
call build_and_publish_core.cmd
84

9-
call create_version_zip.cmd ..\..\Develop\Replace.App\bin\Release\netcoreapp2.1\publish\win64 Replace.App.dll * core_win64
10-
call create_version_zip.cmd ..\..\Develop\Replace.App\bin\Release\netcoreapp2.1\publish\linux64 Replace.App.dll * core_linux64
11-
call create_version_zip.cmd ..\..\Develop\Replace.App\bin\Release\netcoreapp2.1\publish\osx Replace.App.dll * core_osx64
12-
call create_version_zip.cmd ..\..\Develop\Replace\bin\Release Replace.exe Replace.exe win
5+
call create_version_zip.cmd ..\..\Develop\Replace.App\bin\Release\net6.0\publish\linux-x64 ..\..\Replace.App.dll * linux_x64
6+
call create_version_zip.cmd ..\..\Develop\Replace.App\bin\Release\net6.0\publish\osx-x64 ..\..\Replace.App.dll * osx_x64
7+
call create_version_zip.cmd ..\..\Develop\Replace.App\bin\Release\net6.0\publish\win-x64 ..\..\Replace.App.dll * win_x64
8+
call create_version_zip.cmd ..\..\Develop\Replace.App\bin\Release\net6.0\publish\win-x64-self ..\..\Replace.App.dll * win_x64_self

‎Deploy/build_scripts/build_and_publish.cmd‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,10 @@
1-
"%MsBuild%" ..\..\Develop\Replace.sln /t:Replace /p:Configuration="Release"
1+
dotnet build --configuration Release ..\..\Develop\Replace.sln
2+
3+
dotnet publish -p:PublishProfile=Linux64Profile ..\..\Develop\Replace.App\Replace.App.csproj
4+
dotnet publish -p:PublishProfile=OsxProfile ..\..\Develop\Replace.App\Replace.App.csproj
5+
dotnet publish -p:PublishProfile=Win64Profile ..\..\Develop\Replace.App\Replace.App.csproj
6+
dotnet publish -p:PublishProfile=Win64SelfProfile ..\..\Develop\Replace.App\Replace.App.csproj
7+
8+
9+
10+

‎Deploy/build_scripts/build_and_publish_core.cmd‎

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

‎Deploy/build_scripts/create_version_zip.cmd‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,31 @@ set SUFFIX="%~4"
1515

1616
set PWD=%cd%
1717

18-
1918
cd %OUTPUT_DIRECTORY%
2019

2120
REM get version name
2221
call powershell.exe -Command "[System.Reflection.Assembly]::LoadFrom('%DLL%').GetName().Version.ToString();" > out.tmp
22+
2323
set /p VERSION=< out.tmp
2424
del /Q out.tmp
2525

2626
SET VERSION=%VERSION:.=_%
27+
echo Version: %VERSION%
28+
29+
SET SevenZip="C:\Program Files\7-Zip\7z.exe"
30+
31+
echo Used 7 Zip: %SevenZip%
32+
echo Zip File Name: "Replace_%VERSION%_%SUFFIX%.zip"
33+
echo File To Zip: %FILES_TO_ZIP%
34+
35+
SET ZIP_FILE_NAME="Replace_%VERSION%_%SUFFIX%.zip"
36+
37+
del /Q %ZIP_FILE_NAME%
2738

2839
REM Create zip file with 7zip
29-
call "%SevenZip%" a "Replace_%VERSION%_%SUFFIX%.zip" %FILES_TO_ZIP%
40+
call %SevenZip% a %ZIP_FILE_NAME% %FILES_TO_ZIP%
41+
42+
copy %ZIP_FILE_NAME% %PWD%
3043

3144
cd %PWD%
3245

@@ -41,4 +54,4 @@ echo dll: DLL to get the version
4154
echo files_to_zip: to zip: files which should be included in the zip file
4255
echo suffix: suffix for the zip file name
4356

44-
:end
57+
:end

‎Deploy/config.xml‎

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

‎Deploy/config_with_tags.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</RegexReplaceValue>
88
<RegexReplaceValue>
99
<Regex>AssemblyCopyright.+?]</Regex>
10-
<ReplaceValue>AssemblyCopyright("Copyright Replace AG")]</ReplaceValue>
10+
<ReplaceValue>AssemblyCopyright("© Replace AG")]</ReplaceValue>
1111
</RegexReplaceValue>
1212
<RegexReplaceValue>
1313
<Regex>AssemblyProduct.+?]</Regex>
@@ -27,7 +27,7 @@
2727
</RegexReplaceValue>
2828
<RegexReplaceValue>
2929
<Regex>AssemblyTrademark.+?]</Regex>
30-
<ReplaceValue>AssemblyTrademark("")]</ReplaceValue>
30+
<ReplaceValue>AssemblyTrademark("https://github.com/epsmae/Replace")]</ReplaceValue>
3131
</RegexReplaceValue>
3232
<RegexReplaceValue>
3333
<Regex>&lt;Version&gt;.*?&lt;\/Version&gt;</Regex>

‎Deploy/setAssemblyInfo.cmd‎

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

Deploy/setAssemblyInfoConfig.cmd renamed to Deploy/setAssemblyInfoConfig_net6-self.cmd

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,12 @@ rem check version number
99
if "%~2"=="" goto wrongParam
1010
set Version="%~2"
1111

12-
set REPLACE_EXE="..\Develop\Replace\bin\Release\Replace.exe"
13-
14-
rem **********************************************
15-
rem User defined values
16-
rem ##############################################
17-
set Company=""
18-
set Product="Replace"
19-
rem the ¸ (U0184) generates a © sign
20-
set Copyright=""
21-
set Trademark=""
22-
set Culture=""
23-
rem ##############################################
24-
12+
set REPLACE_DLL="..\Develop\Replace.App\bin\Release\net6.0\publish\win-x64-self\Replace.App.exe"
2513

2614
echo root: %root%
2715
echo version %Version%
2816

29-
30-
%REPLACE_EXE% -c config_with_tags.xml -t #0,%root% #1,%Version% -v
31-
32-
33-
17+
%REPLACE_DLL% -c config_with_tags.xml -t #0,%root% #1,%Version% -v
3418

3519
rem everything ok!
3620
:end
@@ -43,7 +27,7 @@ rem one or more arguments are not correct
4327
echo usage: %~0 rootPath Version Product
4428
echo rootPath: The directory from which the script searches recursively the AssemblyInfo files.
4529
echo Version: The Version number which should get inserted into the AssemblyInfo files.
46-
echo Example %~0 ..\..\Develop\App 1.2.3.4
30+
echo Example %~0 ..\Develop 1.2.3.4
4731
ENDLOCAL
4832
exit /B 1
4933

Deploy/setAssemblyInfoConfig_core.cmd renamed to Deploy/setAssemblyInfoConfig_net6.cmd

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,12 @@ rem check version number
99
if "%~2"=="" goto wrongParam
1010
set Version="%~2"
1111

12-
set REPLACE_DLL="..\Develop\Replace.App\bin\Release\netcoreapp2.1\publish\win64\Replace.App.dll"
13-
14-
rem **********************************************
15-
rem User defined values
16-
rem ##############################################
17-
set Company=""
18-
set Product="Replace"
19-
rem the ¸ (U0184) generates a © sign
20-
set Copyright=""
21-
set Trademark=""
22-
set Culture=""
23-
rem ##############################################
24-
12+
set REPLACE_DLL="..\Develop\Replace.App\bin\Release\net6.0\publish\win-x64\Replace.App.exe"
2513

2614
echo root: %root%
2715
echo version %Version%
2816

29-
dotnet %REPLACE_DLL% -c config_with_tags.xml -t #0,%root% #1,%Version% -v
30-
31-
32-
17+
%REPLACE_DLL% -c config_with_tags.xml -t #0,%root% #1,%Version% -v
3318

3419
rem everything ok!
3520
:end
@@ -42,7 +27,7 @@ rem one or more arguments are not correct
4227
echo usage: %~0 rootPath Version Product
4328
echo rootPath: The directory from which the script searches recursively the AssemblyInfo files.
4429
echo Version: The Version number which should get inserted into the AssemblyInfo files.
45-
echo Example %~0 ..\..\Develop\App 1.2.3.4
30+
echo Example %~0 ..\Develop 1.2.3.4
4631
ENDLOCAL
4732
exit /B 1
4833

‎Develop/Replace.App.Test/Replace.App.Test.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
@@ -36,9 +36,9 @@
3636
</ItemGroup>
3737

3838
<ItemGroup>
39-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
40-
<PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
41-
<PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
39+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
40+
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
41+
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
4242
</ItemGroup>
4343

4444
<ItemGroup>

0 commit comments

Comments
 (0)