Skip to content

Commit

Permalink
Merge branch 'net7.0' of https://github.com/Samsung/Tizen.NET into re…
Browse files Browse the repository at this point in the history
…lease/7.0.100
  • Loading branch information
JoonghyunCho committed Nov 22, 2022
2 parents cb9b2d0 + 8b240a3 commit 20901f5
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 16 deletions.
21 changes: 13 additions & 8 deletions workload/Config.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@ $(TMPDIR)/dotnet-version.config: $(TOP)/build/Versions.props
@grep "<MicrosoftDotnetSdkInternalPackageVersion>" build/Versions.props | sed -e 's/<\/*MicrosoftDotnetSdkInternalPackageVersion>//g' -e 's/[ \t]*/DOTNET_VERSION=/' > $@
DOTNET_VERSION_BAND = $(firstword $(subst -, ,$(DOTNET_VERSION)))

IS_PRERELEASE_DOTNET=$(findstring -,$(DOTNET_VERSION))
IS_PRERELEASE=$(findstring -,$(DOTNET_VERSION))
VERSIONS=$(shell echo $(DOTNET_VERSION) | tr "." "\n")
ifneq ($(IS_PRERELEASE_DOTNET),)
ifneq ($(IS_PRERELEASE),)
VERSIONS := $(shell echo $(VERSIONS) | tr "-" "\n")
endif

MAJOR = $(word 1,$(VERSIONS))
MINOR = $(word 2,$(VERSIONS))
BAND = $(word 3,$(VERSIONS))
MICRO = $(word 3,$(VERSIONS))
BAND := $(shell echo "${MICRO}" | cut -c1)00

PRERELEASE_DOTNET = $(word 4,$(VERSIONS))
PRERELEASE_DOTNET_VERSION = $(word 5,$(VERSIONS))

Expand All @@ -25,15 +27,18 @@ else
endif

ifeq ($(MAJOR),6)
DOTNET6_MANIFESTS_DESTDIR := $(MAJOR).$(MINOR).$(BAND)
DOTNET_MANIFESTS_DESTDIR := $(DOTNET_DESTDIR)/sdk-manifests/$(DOTNET6_MANIFESTS_DESTDIR)/samsung.net.sdk.tizen
DOTNET_VERSION_BAND := $(MAJOR).$(MINOR).$(BAND)
else
ifneq ($(IS_PRERELEASE_DOTNET),)
DOTNET_VERSION_BAND := $(MAJOR).$(MINOR).$(BAND)-$(PRERELEASE_DOTNET).$(PRERELEASE_DOTNET_VERSION)
ifneq ($(IS_PRERELEASE),)
DOTNET_VERSION_BAND := $(MAJOR).$(MINOR).$(MICRO)-$(PRERELEASE_DOTNET).$(PRERELEASE_DOTNET_VERSION)
else
DOTNET_VERSION_BAND := $(MAJOR).$(MINOR).$(BAND)
DOTNET_VERSION_BAND := $(MAJOR).$(MINOR).$(MICRO)
endif
DOTNET_MANIFESTS_DESTDIR = $(DOTNET_DESTDIR)/sdk-manifests/$(DOTNET_VERSION_BAND)/samsung.net.sdk.tizen
endif
DOTNET_MANIFESTS_DESTDIR = $(DOTNET_DESTDIR)/sdk-manifests/$(DOTNET_VERSION_BAND)/samsung.net.sdk.tizen


# TIZEN_WORKLOAD_VERSION
-include $(TMPDIR)/workload-version.config
Expand All @@ -48,7 +53,7 @@ CURRENT_HASH := $(shell git log -1 --pretty=%h)

# BRANCH_NAME
ifeq ($(BRANCH_NAME),)
CURRENT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD | sed 's/.*\///')
CURRENT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
else
CURRENT_BRANCH := $(BRANCH_NAME)
endif
Expand Down
6 changes: 3 additions & 3 deletions workload/build/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!--
Workload version:
* The first two numbers represent the major and minor version of the Tizen OS.
* The third number is the sdk version band with release count.
* However, the first digit of the third number starts at 100.
* The third number is the workload release count.
* However, the first digit of the third number starts at 101.
Pre-release version:
1) CI Versions
Expand All @@ -15,7 +15,7 @@
example: -preview.3.100+sha12345
-->
<PropertyGroup>
<TizenWorkloadVersion>7.0.100</TizenWorkloadVersion>
<TizenWorkloadVersion>7.0.103</TizenWorkloadVersion>
</PropertyGroup>

<!--
Expand Down
3 changes: 2 additions & 1 deletion workload/scripts/workload-install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@ $ProgressPreference = "SilentlyContinue"
$ManifestBaseName = "Samsung.NET.Sdk.Tizen.Manifest"

$LatestVersionMap = @{
"$ManifestBaseName-6.0.100" = "6.5.100-rc.1.120";
"$ManifestBaseName-6.0.100" = "7.0.101";
"$ManifestBaseName-6.0.200" = "7.0.100-preview.13.6";
"$ManifestBaseName-6.0.300" = "7.0.304";
"$ManifestBaseName-6.0.400" = "7.0.400";
"$ManifestBaseName-7.0.100-preview.6" = "7.0.100-preview.6.14";
"$ManifestBaseName-7.0.100-preview.7" = "7.0.100-preview.7.20";
"$ManifestBaseName-7.0.100-rc.1" = "7.0.100-rc.1.22";
"$ManifestBaseName-7.0.100-rc.2" = "7.0.100-rc.2.24";
"$ManifestBaseName-7.0.100" = "7.0.100";
}

function New-TemporaryDirectory {
Expand Down
3 changes: 2 additions & 1 deletion workload/scripts/workload-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ DOTNET_DEFAULT_PATH_MACOS="/usr/local/share/dotnet"
UPDATE_ALL_WORKLOADS="false"

LatestVersionMap=(
"$MANIFEST_BASE_NAME-6.0.100=6.5.100-rc.1.120"
"$MANIFEST_BASE_NAME-6.0.100=7.0.101"
"$MANIFEST_BASE_NAME-6.0.200=7.0.100-preview.13.6"
"$MANIFEST_BASE_NAME-6.0.300=7.0.304"
"$MANIFEST_BASE_NAME-6.0.400=7.0.400"
"$MANIFEST_BASE_NAME-7.0.100-preview.6=7.0.100-preview.6.14"
"$MANIFEST_BASE_NAME-7.0.100-preview.7=7.0.100-preview.7.20"
"$MANIFEST_BASE_NAME-7.0.100-rc.1=7.0.100-rc.1.22"
"$MANIFEST_BASE_NAME-7.0.100-rc.2=7.0.100-rc.2.24"
"$MANIFEST_BASE_NAME-7.0.100=7.0.100"
)

while [ $# -ne 0 ]; do
Expand Down
2 changes: 1 addition & 1 deletion workload/src/Samsung.Tizen.Ref/data/PackageOverrides.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Tizen.NET|4.0.0
Tizen.NET.API10|10.0.0.16834
Tizen.NET.API10|10.0.0.17508
Tizen.NET.API9|9.0.0.16760
Tizen.NET.API8|8.0.0.15631
Tizen.NET.API7|7.0.0.15162
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Copyright (c) Samsung All rights reserved.
<ItemGroup>
<KnownFrameworkReference
Include="Samsung.Tizen"
TargetFramework="net7.0-tizen7.0"
TargetFramework="net7.0-tizen$(_DefaultTargetPlatformVersion)"
TargetingPackName="Samsung.Tizen.Ref"
TargetingPackVersion="**FromWorkload**"
Profile="Tizen"
Expand All @@ -56,7 +56,7 @@ Copyright (c) Samsung All rights reserved.
Include="Samsung.Tizen"
TargetFramework="net6.0-tizen$(_DefaultTargetPlatformVersion)"
TargetingPackName="Samsung.Tizen.Ref"
TargetingPackVersion="7.0.303"
TargetingPackVersion="**FromWorkload**"
Profile="Tizen"
/>
<KnownFrameworkReference
Expand Down

0 comments on commit 20901f5

Please sign in to comment.