Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
@wieslawsoltes
wieslawsoltes committed Nov 3, 2022
1 parent 87fecea commit e7d30e8
Show file tree
Hide file tree
Showing 16 changed files with 14 additions and 57 deletions.
36 changes: 0 additions & 36 deletions .github/workflows/pages.yml
View file

This file was deleted.

1 change: 0 additions & 1 deletion ThemeEditor.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "props", "props", "{A88815F2
build\XUnit.props = build\XUnit.props
build\SourceLink.props = build\SourceLink.props
build\SignAssembly.props = build\SignAssembly.props
build\Avalonia.Web.Blazor.props = build\Avalonia.Web.Blazor.props
build\Avalonia.Themes.Fluent.props = build\Avalonia.Themes.Fluent.props
build\Avalonia.Themes.Simple.props = build\Avalonia.Themes.Simple.props
EndProjectSection
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ resources:
endpoint: wieslawsoltes
type: github
name: wieslawsoltes/BuildTemplates
ref: refs/tags/v1.0.0
ref: refs/tags/v2.0.0

variables:
BuildConfiguration: 'Release'
BuildPlatform: 'Any CPU'
PublishFramework: 'net6.0'
PublishFramework: 'net7.0'
PublishProject: 'ColorPickerDemo'
PublishRuntime: ''

Expand Down
2 changes: 1 addition & 1 deletion build/Avalonia.Desktop.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview2" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview3" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build/Avalonia.Diagnostics.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview2" />
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview3" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build/Avalonia.ReactiveUI.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview2" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview3" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build/Avalonia.Themes.Fluent.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview2" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview3" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build/Avalonia.Themes.Simple.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia.Themes.Simple" Version="11.0.0-preview2" />
<PackageReference Include="Avalonia.Themes.Simple" Version="11.0.0-preview3" />
</ItemGroup>
</Project>
6 changes: 0 additions & 6 deletions build/Avalonia.Web.Blazor.props
View file

This file was deleted.

2 changes: 1 addition & 1 deletion build/Avalonia.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0-preview2" />
<PackageReference Include="Avalonia" Version="11.0.0-preview3" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build/Base.props
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VersionPrefix>11.0.0</VersionPrefix>
<VersionSuffix>preview2</VersionSuffix>
<VersionSuffix>preview3</VersionSuffix>
<Authors>Wiesław Šoltés</Authors>
<Company>Wiesław Šoltés</Company>
<Copyright>Copyright © Wiesław Šoltés 2022</Copyright>
Expand Down
2 changes: 1 addition & 1 deletion build/build/_build.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<IsPackable>False</IsPackable>
<NoWarn>CS0649;CS0169</NoWarn>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.100",
"version": "7.0.100-rc.2.22477.23",
"rollForward": "latestMinor",
"allowPrerelease": true
}
Expand Down
2 changes: 1 addition & 1 deletion samples/ColorPickerDemo/ColorPickerDemo.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<TrimMode>copyused</TrimMode>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
Expand Down
2 changes: 1 addition & 1 deletion src/ThemeEditor.Controls.ColorPicker/ThemeEditor.Controls.ColorPicker.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net461;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net461;net6.0</TargetFrameworks>
<OutputType>Library</OutputType>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...meEditor.Controls.ColorPicker.UnitTests/ThemeEditor.Controls.ColorPicker.UnitTests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<OutputType>Library</OutputType>
<IsPackable>False</IsPackable>
<Nullable>enable</Nullable>
Expand Down

0 comments on commit e7d30e8

Please sign in to comment.