Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Odata-docs/client/code-generation-tool.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Expand **Online > Visual Studio Gallery > Tools > Connected Service**, and selec

Click **Download**.

![image1](/odata/assets/tooling/odata-connected-service-install-extension.png)
![image1](/Odata-docs/assets/tooling/odata-connected-service-install-extension.png)

Then it will pop up a **VSIX Installer** window, Click **Install**.

Expand All @@ -70,23 +70,23 @@ In the **Solution Explorer** pane, right click the "TrippinApp" project and sele

In the **Add Connected Service** dialog, select **OData** and then click **Configure**.

![image2](/odata/assets/tooling/odata-connected-service-new.PNG)
![image2](/Odata-docs/assets/tooling/odata-connected-service-new.PNG)

In the **Configure endpoint** dialog, input the service name and the OData service endpoint, then click **Next** button.

![image3](/odata/assets/tooling/odata-connected-service-config-endpoint.PNG)
![image3](/Odata-docs/assets/tooling/odata-connected-service-config-endpoint.PNG)

In the **Settings** dialog, enter the file name(without extension) of the proxy file and click **Finish**.

![image4](/odata/assets/tooling/odata-connected-service-config-file-name.PNG)
![image4](/Odata-docs/assets/tooling/odata-connected-service-config-file-name.PNG)

In the **Settings** dialog, You also can configure some other settings by click **AdvancedSettings** link. Then you can set the related code generation settings.

![image5](/odata/assets/tooling/odata-connected-service-advanced-settings.PNG)
![image5](/Odata-docs/assets/tooling/odata-connected-service-advanced-settings.PNG)

Once you finished all those settings, click **Finish**. This tool will begin to install the related NuGet packages and generate the client proxy file into your project.

![image6](/odata/assets/tooling/odata-connected-service-generate.PNG)
![image6](/Odata-docs/assets/tooling/odata-connected-service-generate.PNG)

### Consume the OData service

Expand All @@ -111,7 +111,7 @@ Now, the developer can write client code to consume the OData Service.
}
```

![image7](/odata/assets/tooling/odata-connected-service-consume.PNG)
![image7](/Odata-docs/assets/tooling/odata-connected-service-consume.PNG)

## Summary

Expand Down
2 changes: 1 addition & 1 deletion Odata-docs/includes/appliesto-odataclient-v6.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ author: madansr7

# OData client v6 supported

6![OData Client V^](/odata/assets/doc-assets/yes.png) OData Client V6
6![OData Client V^](/Odata-docs/assets/doc-assets/yes.png) OData Client V6
2 changes: 1 addition & 1 deletion Odata-docs/includes/appliesto-odataclient-v7.12.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ author: gathogojr

# OData client v7.12.1 supported

![OData Client V7.12.1](/odata/assets/doc-assets/yes.png) OData Client V7.12.1
![OData Client V7.12.1](/Odata-docs/assets/doc-assets/yes.png) OData Client V7.12.1
2 changes: 1 addition & 1 deletion Odata-docs/includes/appliesto-odataclient-v7.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ author: madansr7

# OData client v7 supported

![OData Client V7](/odata/assets/doc-assets/yes.png) OData Client V7
![OData Client V7](/Odata-docs/assets/doc-assets/yes.png) OData Client V7
2 changes: 1 addition & 1 deletion Odata-docs/includes/appliesto-odataclient-v8.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ author: habbes

# OData client v8 supported

![OData Client V8](/odata/assets/doc-assets/yes.png) OData Client V8
![OData Client V8](/Odata-docs/assets/doc-assets/yes.png) OData Client V8
2 changes: 1 addition & 1 deletion Odata-docs/includes/appliesto-odatalib-v6.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ author: madansr7
---
# OData Core lib v6 supported

![OData Core lib v6 supported](/odata/assets/doc-assets/yes.png) OData Core Lib V6
![OData Core lib v6 supported](/Odata-docs/assets/doc-assets/yes.png) OData Core Lib V6

2 changes: 1 addition & 1 deletion Odata-docs/includes/appliesto-odatalib-v7.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ author: madansr7
---
# OData core lib v7 supported

![OData core lib v7 supported](/odata/assets/doc-assets/yes.png) OData Core Lib V7
![OData core lib v7 supported](/Odata-docs/assets/doc-assets/yes.png) OData Core Lib V7

2 changes: 1 addition & 1 deletion Odata-docs/includes/appliesto-odatalib-v8.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ author: habbes
---
# OData core lib v8 supported

![OData core lib v8 supported](/odata/assets/doc-assets/yes.png) OData Core Lib V8
![OData core lib v8 supported](/Odata-docs/assets/doc-assets/yes.png) OData Core Lib V8
2 changes: 1 addition & 1 deletion Odata-docs/includes/appliesto-webapi-core-v7.5.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ author: madansr7
---
# OData WebApi v7.5 for .NET Core

![OData WebApi v7.5 for dot NET Core](/odata/assets/doc-assets/yes.png) OData AspNetCore WebApi V7.5
![OData WebApi v7.5 for dot NET Core](/Odata-docs/assets/doc-assets/yes.png) OData AspNetCore WebApi V7.5

2 changes: 1 addition & 1 deletion Odata-docs/includes/appliesto-webapi-v6.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ author: madansr7
ms.author: saumadan
---
# OData Webapi for Webapi supported
![Green circular checkmark icon to indicate a success.](/odata/assets/doc-assets/yes.png) OData AspNet WebApi V6
![Green circular checkmark icon to indicate a success.](/Odata-docs/assets/doc-assets/yes.png) OData AspNet WebApi V6
2 changes: 1 addition & 1 deletion Odata-docs/includes/appliesto-webapi-v7.5.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ author: gathogojr
ms.author: jogathog
---
# OData WebApi v7.5 for .NET FX
![Green circle with a checkmark inside of it.](/odata/assets/doc-assets/yes.png) OData AspNet WebApi V7.5
![Green circle with a checkmark inside of it.](/Odata-docs/assets/doc-assets/yes.png) OData AspNet WebApi V7.5
2 changes: 1 addition & 1 deletion Odata-docs/includes/appliesto-webapi-v7.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ author: madansr7
ms.author: saumadan
---
# OData WebApi v7 for aspnet webapi supported
![Green circle with a checkmark inside it.](/odata/assets/doc-assets/yes.png) OData AspNet WebApi V7
![Green circle with a checkmark inside it.](/Odata-docs/assets/doc-assets/yes.png) OData AspNet WebApi V7
2 changes: 1 addition & 1 deletion Odata-docs/includes/appliesto-webapi-v8.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ ms.author: clhabins
---
# OData Web API 8 supported

![Green circle with a checkmark inside it.](/odata/assets/doc-assets/yes.png) OData Web API v8
![Green circle with a checkmark inside it.](/Odata-docs/assets/doc-assets/yes.png) OData Web API v8
6 changes: 3 additions & 3 deletions Odata-docs/odatalib/v6/build-basic-model.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ The `SampleModelBuilder` class is used to build and return an entity data model

In Solution Explorer, right-click the project **EdmLibSample**. From the context menu, select **Add > Class**. Name the class **SampleModelBuilder**.

![Screenshot of right-click menu has the Add option highlighted, which shows another menu showing the Class option being highlighted.](/odata/assets/2015-04-16-add-class.png)
![Screenshot of right-click menu has the Add option highlighted, which shows another menu showing the Class option being highlighted.](/Odata-docs/assets/2015-04-16-add-class.png)

In the **SampleModelBuilder.cs** file, add the following `using` clauses to introduce the EDM definitions:

Expand Down Expand Up @@ -279,11 +279,11 @@ For now, there is no need to understand how the model is being written as CSDL.

From the **DEBUG** menu, click **Start Debugging** to build and run the sample. The console window should appear and then disappear in a flash.

![Screenshot of Microsoft Visual Studio, showing the Debug tab's Start Debugging option being highlighted.](/odata/assets/2015-04-17-debug.png)
![Screenshot of Microsoft Visual Studio, showing the Debug tab's Start Debugging option being highlighted.](/Odata-docs/assets/2015-04-17-debug.png)

Open the **csdl.xml** file under the **output directory** with Internet Explorer (or other XML viewer if you like). The content should look similar to the following:

![Screenshot of the output directory, showing the contents of the e d m x tag.](/odata/assets/2015-04-17-csdl.png)
![Screenshot of the output directory, showing the contents of the e d m x tag.](/Odata-docs/assets/2015-04-17-csdl.png)

As you can see, the document contains all the elements we have built so far.

Expand Down
2 changes: 1 addition & 1 deletion Odata-docs/odatalib/v6/create-spatial-instances.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ GeographyPoint point6 = GeographyPoint.Create(latitude: 12.34, longitude: 56.78,

Spatial instances can be directly put into `ODataPrimitiveValue` as property values. Using the `Address` type from the last section:

![image](/odata/assets/2015-04-21-csdl.png)
![image](/Odata-docs/assets/2015-04-21-csdl.png)

An `ODataComplexValue` for the `Address` type could be constructed as follows:

Expand Down
2 changes: 1 addition & 1 deletion Odata-docs/odatalib/v6/define-annotations.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,4 @@ This code adds an **inline** `Edm.Int32` annotation `Sample.NS.Width` targetting
### Run the Sample
Build and run the sample. Then open the **csdl.xml** file under the **output directory**. The content of **csdl.xml** should look like the following:

![image](/odata/assets/2015-04-20-csdl1.png)
![image](/Odata-docs/assets/2015-04-20-csdl1.png)
2 changes: 1 addition & 1 deletion Odata-docs/odatalib/v6/define-entity-relations.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ This code:
### Run the Sample
Build and run the sample. Then open the **csdl.xml** file under the **output directory**. The content of **csdl.xml** should look like the following:

![image](/odata/assets/2015-04-18-csdl.png)
![image](/Odata-docs/assets/2015-04-18-csdl.png)

### References
[[Tutorial & Sample] Containment is Coming with OData V4](https://devblogs.microsoft.com/odata/tutorial-sample-containment-is-coming-with-odata-v4/).
2 changes: 1 addition & 1 deletion Odata-docs/odatalib/v6/define-operations.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,4 +187,4 @@ The `Sample.NS.MostValuable` function import is actually the `Sample.NS.MostExpe

Build and run the sample. Then open the **csdl.xml** file under the **output directory**. The content of **csdl.xml** should look like the following:

![image](/odata/assets/2015-04-20-csdl.png)
![image](/Odata-docs/assets/2015-04-20-csdl.png)
2 changes: 1 addition & 1 deletion Odata-docs/odatalib/v6/define-singleton.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ namespace EdmLibSample
### Run the Sample
Build and run the sample. Then open the **csdl.xml** file under the **output directory**. The content of **csdl.xml** should look like the following:

![image](/odata/assets/2015-04-18-csdl1.png)
![image](/Odata-docs/assets/2015-04-18-csdl1.png)

### References
[[Tutorial & Sample] Use Singleton to define your special entity](https://devblogs.microsoft.com/odata/tutorial-sample-use-singleton-to-define-your-special-entity/).
2 changes: 1 addition & 1 deletion Odata-docs/odatalib/v6/define-spatial-property.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ This code:

Build and run the sample. Then open the **csdl.xml** file under the **output directory**. The content of **csdl.xml** should look like the following:

![image](/odata/assets/2015-04-21-csdl.png)
![image](/Odata-docs/assets/2015-04-21-csdl.png)
2 changes: 1 addition & 1 deletion Odata-docs/odatalib/v6/define-type-inheritance.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,4 @@ This code:

Build and run the sample. Then open the **csdl.xml** file under the **output directory**. The content of **csdl.xml** should look like the following:

![image](/odata/assets/2015-04-19-csdl.png)
![image](/Odata-docs/assets/2015-04-19-csdl.png)
2 changes: 1 addition & 1 deletion Odata-docs/odatalib/v6/read-write-model.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ This code first reads the model from the CSDL document **csdl.xml** and then wri
### Run the Sample
Build and run the sample. Then open both the **csdl.xml** file and the **csdl1.xml** file under the **output directory**. The content of **csdl1.xml** should look like the following:

![image](/odata/assets/2015-04-17-csdl1.png)
![image](/Odata-docs/assets/2015-04-17-csdl1.png)

You can see that the contents of **csdl.xml** and **csdl1.xml** are exactly the same except for **the order of the elements**. This is because EdmLib will reorder the elements when parsing a CSDL document.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ You plugin a specific set of conversion rules by setting the `ODataUriResolver.T

Let's see a simple example. Consider the expression `Decimal_6_3 mul Decimal_5_4` where `Decimal_6_3` and `Decimal_5_4` are both structural properties of `Edm.Decimal` type. The former has precision 6 and scale 3, while the latter has 5 and 4. Using the default conversion rules, the result would be:

![facets](/odata/assets/2016-08-23-facets.png)
![facets](/Odata-docs/assets/2016-08-23-facets.png)
8 changes: 4 additions & 4 deletions Odata-docs/odatalib/v7/edm/build-basic-model.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ In Visual Studio, from the **File** menu, select **New > Project**.

Expand **Installed > Templates > Visual C# > Windows Desktop**, and select the **Console Application** template. Name the project **EdmLibSample**, and click **OK**.

![new project](/odata/assets/2015-04-16-new-project.png)
![new project](/Odata-docs/assets/2015-04-16-new-project.png)

## Install the EdmLib package

Expand All @@ -44,7 +44,7 @@ The `SampleModelBuilder` class is used to build and return an entity data model

In Solution Explorer, right-click the project **EdmLibSample**. From the context menu, select **Add > Class**. Name the class **SampleModelBuilder**.

![add class](/odata/assets/2015-04-16-add-class.png)
![add class](/Odata-docs/assets/2015-04-16-add-class.png)

In the **SampleModelBuilder.cs** file, add the following `using` directives to introduce the EDM definitions:

Expand Down Expand Up @@ -318,11 +318,11 @@ For now, there is no need to understand how the model is written to CSDL. The de

From the **DEBUG** menu, click **Start Debugging** to build and run the sample. The console window should appear and then disappear in a flash.

![debugging](/odata/assets/2015-04-17-debug.png)
![debugging](/Odata-docs/assets/2015-04-17-debug.png)

Open the **csdl.xml** file under the **output directory** with Internet Explorer (or any other XML viewer you prefer). The content should look similar to the following:

![csdl](/odata/assets/2015-04-17-csdl.png)
![csdl](/Odata-docs/assets/2015-04-17-csdl.png)

As you can see, the document contains all the elements we have built so far.

Expand Down
2 changes: 1 addition & 1 deletion Odata-docs/odatalib/v7/edm/define-annotations.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,4 @@ This code adds an **inline** `Edm.Int32` annotation `Sample.NS.Width` to the pro
### Run the sample
Build and run the sample. Then open the file **csdl.xml** under the **output directory**. The content should look like the following:

![csdl1](/odata/assets/2015-04-20-csdl1.png)
![csdl1](/Odata-docs/assets/2015-04-20-csdl1.png)
2 changes: 1 addition & 1 deletion Odata-docs/odatalib/v7/edm/define-entity-relations.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ This code:
### Run the sample
Build and run the sample. Then open the file **csdl.xml** under the **output directory**. The content of it should look like the following:

![csdl](/odata/assets/2015-04-18-csdl.png)
![csdl](/Odata-docs/assets/2015-04-18-csdl.png)

### References
[[Tutorial & Sample] Containment is Coming with OData V4](https://devblogs.microsoft.com/odata/tutorial-sample-containment-is-coming-with-odata-v4/).
2 changes: 1 addition & 1 deletion Odata-docs/odatalib/v7/edm/define-operations.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,5 +176,5 @@ The `Sample.NS.MostValuable` function import is actually the `Sample.NS.MostExpe
### Run the sample
Build and run the sample. Then open the file **csdl.xml** under the **output directory**. The content should look like the following:

![csdl](/odata/assets/2015-04-20-csdl.png)
![csdl](/Odata-docs/assets/2015-04-20-csdl.png)

2 changes: 1 addition & 1 deletion Odata-docs/odatalib/v7/edm/define-singleton.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ namespace EdmLibSample
### Run the Sample
Build and run the sample. Then open the file **csdl.xml** under the **output directory**. The content should look like the following:

![csdl](/odata/assets/2015-04-18-csdl1.png)
![csdl](/Odata-docs/assets/2015-04-18-csdl1.png)

### References
[[Tutorial & Sample] Use Singleton to define your special entity](https://devblogs.microsoft.com/odata/tutorial-sample-use-singleton-to-define-your-special-entity/).
2 changes: 1 addition & 1 deletion Odata-docs/odatalib/v7/edm/define-type-inheritance.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,4 @@ This code:

Build and run the sample. Then open the file **csdl.xml** under the **output directory**. The content should look like the following:

![csdl](/odata/assets/2015-04-19-csdl.png)
![csdl](/Odata-docs/assets/2015-04-19-csdl.png)
2 changes: 1 addition & 1 deletion Odata-docs/odatalib/v7/edm/read-write-model.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ This code first reads the model from the CSDL document **csdl.xml**, and then wr
### Run the sample
Build and run the sample. Then open the file **csdl.xml** and the file **csdl1.xml** under the **output directory**. The content of **csdl1.xml** should look like the following:

![csdl](/odata/assets/2015-04-17-csdl1.png)
![csdl](/Odata-docs/assets/2015-04-17-csdl1.png)

You can see that the contents of **csdl.xml** and **csdl1.xml** are exactly the same except for **the order of the elements**. This is because EdmLib will reorder the elements when parsing a CSDL document.

Expand Down
4 changes: 2 additions & 2 deletions Odata-docs/odatalib/v7/edm/using-model-utilities.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ namespace EdmLibSample
### Run the sample
From the **DEBUG** menu, click **Start Without Debugging** to build and run the sample. The console window should **not** disappear after program exits.

![debug](/odata/assets/2015-04-20-debug.png)
![debug](/Odata-docs/assets/2015-04-20-debug.png)

The output on the console window should look like the following:

![output](/odata/assets/2015-04-20-output.png)
![output](/Odata-docs/assets/2015-04-20-output.png)
4 changes: 2 additions & 2 deletions Odata-docs/odatalib/v7/resource-value.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ Because most of OData customers:

Below is the main inheritance of the ODataValue vs ODataItem in ODL v6.x.

![ODLv6xInheritance](/odata/assets/2018-11-20-ODLv6xInheritance.png)
![ODLv6xInheritance](/Odata-docs/assets/2018-11-20-ODLv6xInheritance.png)

Below is the main inheritance of the ODataValue vs ODataItem in ODL v7.x.

![ODLv7xInheritance](/odata/assets/2018-11-20-ODLv7xInheritance1Class.png)
![ODLv7xInheritance](/Odata-docs/assets/2018-11-20-ODLv7xInheritance1Class.png)

The main changes from 6.x to 7.x is:

Expand Down
2 changes: 1 addition & 1 deletion Odata-docs/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ OData improves semantic interoperability between systems and follows these desig
The OData Protocol is different from other REST-based web service approaches in that it provides a uniform way to describe both the data and the data model. This improves semantic interoperability between systems and allows an ecosystem to emerge. It follows these design principles:

The following image shows how different libraries can be used for server and client side implementations.
![libraries](/odata/assets/library-relationship.png)
![libraries](/Odata-docs/assets/library-relationship.png)

You can find more information on OData specification at [OData.org](https://www.odata.org/).
2 changes: 1 addition & 1 deletion Odata-docs/spatial/create-instances.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ GeographyPoint point6 = GeographyPoint.Create(latitude: 12.34, longitude: 56.78,

Spatial instances can be directly put into `ODataPrimitiveValue` as property values. Using the `Address` type from the last section:

![csdl](/odata/assets/2015-04-21-csdl.png)
![csdl](/Odata-docs/assets/2015-04-21-csdl.png)

An `ODataResource` for the `Address` type could be constructed as follows:

Expand Down
2 changes: 1 addition & 1 deletion Odata-docs/spatial/define-property.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ This code:
### Run the sample
Build and run the sample. Then open the **csdl.xml** file under the **output directory**. The content of **csdl.xml** should look like the following:

![csdl](/odata/assets/2015-04-21-csdl.png)
![csdl](/Odata-docs/assets/2015-04-21-csdl.png)
Loading