marek/SlucovaniRozpisek
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: marek:main
Branches Tags
marek:master
marek:main
..
compare: marek:master
Branches Tags
marek:main
marek:master

No commits in common. "main" and "master" have entirely different histories.
main ... master

4 changed files with 8 additions and 8 deletions
Show Stats Expand all files Collapse all files

4
.drone.yml
View File

@ -3,7 +3,7 @@ name: default
steps: steps:
- name: build - name: build
image: mcr.microsoft.com/dotnet/sdk:10.0 image: mcr.microsoft.com/dotnet/sdk:9.0
commands: commands:
- dotnet build --configuration Release SlucovaniRozpisek.csproj - dotnet build --configuration Release SlucovaniRozpisek.csproj
@ -11,7 +11,7 @@ steps:
image: git.ivasoft.cz/sw/docker-wine-dotnet image: git.ivasoft.cz/sw/docker-wine-dotnet
commands: commands:
- wine tlbexp.exe bin/Release/net472/SlucovaniRozpisek.dll /out:bin/Release/net472/SlucovaniRozpisek.tlb - wine tlbexp.exe bin/Release/net472/SlucovaniRozpisek.dll /out:bin/Release/net472/SlucovaniRozpisek.tlb
- wine Eazfuscator.NET.exe bin/Release/net10.0-windows/SlucovaniRozpisek.dll -k key.snk -n --newline-flush - wine Eazfuscator.NET.exe bin/Release/net9.0-windows/SlucovaniRozpisek.dll -k key.snk -n --newline-flush
# HACK Second build is success as first invocation fails # HACK Second build is success as first invocation fails
# dotnet exec <wix.dll> msi validate <path to SpravceDS.msi # dotnet exec <wix.dll> msi validate <path to SpravceDS.msi
# with error # with error

4
Product.wxs
View File

@ -15,8 +15,8 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<!--Variable for SlucovaniRozpisek Directory--> <!--Variable for SlucovaniRozpisek Directory-->
<?define SlucovaniRozpisek_TargetDir=bin/Release/net10.0-windows/?> <?define SlucovaniRozpisek_TargetDir=bin/Release/net9.0-windows/?>
<?define SlucovaniRozpisek_AdditionalTargetDir=bin/Release/net10.0-windows/de/?> <?define SlucovaniRozpisek_AdditionalTargetDir=bin/Release/net9.0-windows/de/?>
<?define SlucovaniRozpisek_tlbDir=bin/Release/net472/?> <?define SlucovaniRozpisek_tlbDir=bin/Release/net472/?>
<!-- Versions for binaries --> <!-- Versions for binaries -->

6
Setup.wixproj
View File

@ -1,6 +1,6 @@
<Project Sdk="WixToolset.Sdk/5.0.1"> <Project Sdk="WixToolset.Sdk/5.0.1">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net10.0-windows</TargetFrameworks> <TargetFrameworks>net9.0-windows</TargetFrameworks>
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems> <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
@ -18,12 +18,12 @@
<SuppressValidation>true</SuppressValidation> <SuppressValidation>true</SuppressValidation>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>bin\Debug\net10.0-windows</OutputPath> <OutputPath>bin\Debug\net9.0-windows</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>Debug;</DefineConstants> <DefineConstants>Debug;</DefineConstants>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' "> <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputPath>bin\Release\net10.0-windows</OutputPath> <OutputPath>bin\Release\net9.0-windows</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants> <DefineConstants>
</DefineConstants> </DefineConstants>

2
SlucovaniRozpisek.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<OutputType Condition="$(TargetFramework.StartsWith('net4'))">Library</OutputType> <OutputType Condition="$(TargetFramework.StartsWith('net4'))">Library</OutputType>
<TargetFrameworks>net10.0-windows;net472</TargetFrameworks> <TargetFrameworks>net9.0-windows;net472</TargetFrameworks>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<RootNamespace>SlucovaniRozpisek</RootNamespace> <RootNamespace>SlucovaniRozpisek</RootNamespace>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>